2003-05-03 14:17:02

by Vinay K Nallamothu

[permalink] [raw]
Subject: [PATCH 2.5.68] trivial mod_timer fixes for af_wanpipe.c

af_wanpipe.c: trivial {del,add}_timer to mod_timer conversion.

--- linux-2.5.68/net/wanrouter/af_wanpipe.c 2003-04-15 18:16:12.000000000 +0530
+++ linux-2.5.68-nvk/net/wanrouter/af_wanpipe.c 2003-05-03 17:29:36.000000000 +0530
@@ -634,11 +634,8 @@
skb_queue_tail(&sk->write_queue,skb);
atomic_inc(&wp->packet_sent);

- if (!(test_and_set_bit(0, &wp->timer))){
- del_timer(&wp->tx_timer);
- wp->tx_timer.expires = jiffies + 1;
- add_timer(&wp->tx_timer);
- }
+ if (!(test_and_set_bit(0, &wp->timer)))
+ mod_timer(&wp->tx_timer, jiffies + 1);

return(len);