Commit f12d33f4 authored by Stafford Horne's avatar Stafford Horne Committed by David S. Miller

3c59x: Ensure to apply the expires time

In commit 5b6490de ("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: default avatarStafford Horne <shorne@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f73e0c24
...@@ -1602,7 +1602,7 @@ vortex_up(struct net_device *dev) ...@@ -1602,7 +1602,7 @@ vortex_up(struct net_device *dev)
} }
setup_timer(&vp->timer, vortex_timer, (unsigned long)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); setup_timer(&vp->rx_oom_timer, rx_oom_timer, (unsigned long)dev);
if (vortex_debug > 1) if (vortex_debug > 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment