|
@@ -382,9 +382,10 @@ static void arcdev_setup(struct net_device *dev)
|
|
|
dev->flags = IFF_BROADCAST;
|
|
|
}
|
|
|
|
|
|
-static void arcnet_timer(unsigned long data)
|
|
|
+static void arcnet_timer(struct timer_list *t)
|
|
|
{
|
|
|
- struct net_device *dev = (struct net_device *)data;
|
|
|
+ struct arcnet_local *lp = from_timer(lp, t, timer);
|
|
|
+ struct net_device *dev = lp->dev;
|
|
|
|
|
|
if (!netif_carrier_ok(dev)) {
|
|
|
netif_carrier_on(dev);
|
|
@@ -450,7 +451,7 @@ struct net_device *alloc_arcdev(const char *name)
|
|
|
|
|
|
lp->dev = dev;
|
|
|
spin_lock_init(&lp->lock);
|
|
|
- setup_timer(&lp->timer, arcnet_timer, (unsigned long)dev);
|
|
|
+ timer_setup(&lp->timer, arcnet_timer, 0);
|
|
|
}
|
|
|
|
|
|
return dev;
|