From: Stafford Horne Date: Sun, 28 Feb 2016 07:49:29 +0000 (+0900) Subject: 3c59x: Ensure to apply the expires time X-Git-Tag: next-20160301~78^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f12d33f4d83c6837d176e1aef337914089c77957;p=karo-tx-linux.git 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 Signed-off-by: David S. Miller --- 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)