[PATCH] 3c59x: Ensure to apply the expires time

From: Stafford Horne
Date: Sun Feb 28 2016 - 02:50:26 EST


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@xxxxxxxxx>
---

I think a patch like this will help restore the behavior. Also,
its small cleanup since we dont need to do separate set to expire
and call to add_timer. But thats a style preference.

drivers/net/ethernet/3com/3c59x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index c377607..7b881ed 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)
--
2.5.0