|
@@ -1065,10 +1065,8 @@ sis900_open(struct net_device *net_dev)
|
|
|
|
|
|
/* Set the timer to switch to check for link beat and perhaps switch
|
|
|
to an alternate media type. */
|
|
|
- init_timer(&sis_priv->timer);
|
|
|
+ setup_timer(&sis_priv->timer, sis900_timer, (unsigned long)net_dev);
|
|
|
sis_priv->timer.expires = jiffies + HZ;
|
|
|
- sis_priv->timer.data = (unsigned long)net_dev;
|
|
|
- sis_priv->timer.function = sis900_timer;
|
|
|
add_timer(&sis_priv->timer);
|
|
|
|
|
|
return 0;
|