]> rtime.felk.cvut.cz Git - linux-lin.git/commitdiff
sllin: rx_timer is also used when waiting for received characters while sending Heade...
authorRostislav Lisovy <lisovy@gmail.com>
Fri, 16 Dec 2011 09:46:32 +0000 (10:46 +0100)
committerRostislav Lisovy <lisovy@gmail.com>
Fri, 16 Dec 2011 09:46:32 +0000 (10:46 +0100)
sllin/sllin.c

index f10923e53816fd9e2d8d0aa3be0ce902070f0f97..6a4e8bf0999bf516d3726ff3828b3c70f3417b0f 100644 (file)
@@ -831,6 +831,9 @@ int sllin_kwthread(void *ptr)
                                clear_bit(SLF_MSGEVENT, &sl->flags);
                                kfree_skb(sl->tx_req_skb);
                                netif_wake_queue(sl->dev);
+                               hrtimer_start(&sl->rx_timer,
+                                       ktime_add(ktime_get(), sl->rx_timer_timeout),
+                                       HRTIMER_MODE_ABS);
                                break;
 
                        case SLSTATE_BREAK_SENT:
@@ -846,6 +849,7 @@ int sllin_kwthread(void *ptr)
                                break;
 
                        case SLSTATE_ID_SENT:
+                               hrtimer_cancel(&sl->rx_timer);
                                sl->id_to_send = false;
                                if (sl->data_to_send) {
                                        sllin_send_tx_buff(sl);