diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 16:30:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 16:30:31 -0700 |
| commit | cb46c3701fb7b738de1e22ac4f2d06d18f547a74 (patch) | |
| tree | 7d8740ed7849d31eaea19e696a4ea098ba151a96 /net/sched/sch_generic.c | |
| parent | 9676489866a75fdd56b0d3e40ec7884298bb1338 (diff) | |
| parent | 8872d8e1c4311dd7e5086975df9c76120a0be83b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TCP]: reno sacked_out count fix
[IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match().
[TR]: Remove an unused export.
[IPX]: Correct return type of ipx_map_frame_type().
[IPX]: Correct argument type of ipxrtr_delete().
[PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().
Diffstat (limited to 'net/sched/sch_generic.c')
| -rw-r--r-- | net/sched/sch_generic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 31eb83717c2..138ea92ed26 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -193,8 +193,10 @@ static void dev_watchdog(unsigned long arg) netif_running(dev) && netif_carrier_ok(dev)) { if (netif_queue_stopped(dev) && - (jiffies - dev->trans_start) > dev->watchdog_timeo) { - printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n", dev->name); + time_after(jiffies, dev->trans_start + dev->watchdog_timeo)) { + + printk(KERN_INFO "NETDEV WATCHDOG: %s: transmit timed out\n", + dev->name); dev->tx_timeout(dev); } if (!mod_timer(&dev->watchdog_timer, jiffies + dev->watchdog_timeo)) |