|
@@ -1857,9 +1857,8 @@ static int bcm_enet_probe(struct platform_device *pdev)
|
|
spin_lock_init(&priv->rx_lock);
|
|
spin_lock_init(&priv->rx_lock);
|
|
|
|
|
|
/* init rx timeout (used for oom) */
|
|
/* init rx timeout (used for oom) */
|
|
- init_timer(&priv->rx_timeout);
|
|
|
|
- priv->rx_timeout.function = bcm_enet_refill_rx_timer;
|
|
|
|
- priv->rx_timeout.data = (unsigned long)dev;
|
|
|
|
|
|
+ setup_timer(&priv->rx_timeout, bcm_enet_refill_rx_timer,
|
|
|
|
+ (unsigned long)dev);
|
|
|
|
|
|
/* init the mib update lock&work */
|
|
/* init the mib update lock&work */
|
|
mutex_init(&priv->mib_update_lock);
|
|
mutex_init(&priv->mib_update_lock);
|