diff options
author | Stafford Horne <shorne@gmail.com> | 2016-02-28 02:49:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-28 23:39:26 -0500 |
commit | f12d33f4d83c6837d176e1aef337914089c77957 (patch) | |
tree | 2357f4495a8de6768486173cff46c63f47e0103d | |
parent | f73e0c24bf075cf934e73133f5e89052afac1d32 (diff) |
3c59x: Ensure to apply the expires time
In commit 5b6490def9168af6a ("3c59x: Use setup_timer()") Amitoj
removed add_timer which sets up the epires timer. In this patch
the behavior is restore but it uses mod_timer which is a bit more
compact.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index c377607e6745..7b881edc0b0a 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c | |||
@@ -1602,7 +1602,7 @@ vortex_up(struct net_device *dev) | |||
1602 | } | 1602 | } |
1603 | 1603 | ||
1604 | setup_timer(&vp->timer, vortex_timer, (unsigned long)dev); | 1604 | setup_timer(&vp->timer, vortex_timer, (unsigned long)dev); |
1605 | vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait); | 1605 | mod_timer(&vp->timer, RUN_AT(media_tbl[dev->if_port].wait)); |
1606 | setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev); | 1606 | setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev); |
1607 | 1607 | ||
1608 | if (vortex_debug > 1) | 1608 | if (vortex_debug > 1) |