3c59x: Ensure to apply the expires time

stffrdhrn · davem330 · commit f12d33f4d83c · 2016-02-28T23:39:26.000-05:00
In commit 5b6490d ("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>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1602,7 +1602,7 @@ vortex_up(struct net_device *dev)`
`1602`	`1602`	`}`
`1603`	`1603`
`1604`	`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`	`1606`	`setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);`
`1607`	`1607`
`1608`	`1608`	`if (vortex_debug > 1)`