Skip to content

Commit

Permalink
3c59x: Ensure to apply the expires time
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
stffrdhrn authored and davem330 committed Feb 29, 2016
1 parent f73e0c2 commit f12d33f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/3com/3c59x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f12d33f

Please sign in to comment.