summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/3com
diff options
context:
space:
mode:
authorStafford Horne <shorne@gmail.com>2016-02-28 16:49:29 +0900
committerDavid S. Miller <davem@davemloft.net>2016-02-28 23:39:26 -0500
commitf12d33f4d83c6837d176e1aef337914089c77957 (patch)
tree2357f4495a8de6768486173cff46c63f47e0103d /drivers/net/ethernet/3com
parentf73e0c24bf075cf934e73133f5e89052afac1d32 (diff)
downloadlinux-f12d33f4d83c6837d176e1aef337914089c77957.tar.bz2
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>
Diffstat (limited to 'drivers/net/ethernet/3com')
-rw-r--r--drivers/net/ethernet/3com/3c59x.c2
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)
}
setup_timer(&vp->timer, vortex_timer, (unsigned long)dev);
- vp->timer.expires = RUN_AT(media_tbl[dev->if_port].wait);
+ mod_timer(&vp->timer, RUN_AT(media_tbl[dev->if_port].wait));
setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
if (vortex_debug > 1)