netdev: bunch of drivers: avoid WARN at net/core/dev.c:1328
The drivers were touching net queue before it has been started, so without this patch, the drivers will potentially WARN at net/core/dev.c:1328. I don't have the hardware for the drivers below, so this patch is untested, and thus should be carefully peer reviewed. tc35815.c au1000_eth.c bfin_mac.c macb.c ^ The four drivers are using phylib, they're calling netif_start_queue() in open() callback. So trivially remove netif_tx_schedule_all(). Phylib will handle netif_carrier_*(). cpmac.c fec_mpc52xx.c fs_enet/fs_enet-main.c sh_eth.c ^ The same as above, but these were also needlessly calling netif_carrier_*() functions. So removed queue calls and also remove carrier calls, since phylib will handle it. fs_enet-main.c also didn't call netif_start_queue() at open(), this is fixed now. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3d0f24a74e
commit
c8f15686a4
|
@ -911,9 +911,8 @@ au1000_adjust_link(struct net_device *dev)
|
||||||
if(phydev->link != aup->old_link) {
|
if(phydev->link != aup->old_link) {
|
||||||
// link state changed
|
// link state changed
|
||||||
|
|
||||||
if (phydev->link) // link went up
|
if (!phydev->link) {
|
||||||
netif_tx_schedule_all(dev);
|
/* link went down */
|
||||||
else { // link went down
|
|
||||||
aup->old_speed = 0;
|
aup->old_speed = 0;
|
||||||
aup->old_duplex = -1;
|
aup->old_duplex = -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -357,7 +357,6 @@ static void bfin_mac_adjust_link(struct net_device *dev)
|
||||||
if (!lp->old_link) {
|
if (!lp->old_link) {
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
lp->old_link = 1;
|
lp->old_link = 1;
|
||||||
netif_tx_schedule_all(dev);
|
|
||||||
}
|
}
|
||||||
} else if (lp->old_link) {
|
} else if (lp->old_link) {
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
|
|
|
@ -945,10 +945,8 @@ static void cpmac_adjust_link(struct net_device *dev)
|
||||||
if (!priv->oldlink) {
|
if (!priv->oldlink) {
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
priv->oldlink = 1;
|
priv->oldlink = 1;
|
||||||
netif_tx_schedule_all(dev);
|
|
||||||
}
|
}
|
||||||
} else if (priv->oldlink) {
|
} else if (priv->oldlink) {
|
||||||
netif_tx_stop_all_queues(dev);
|
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
priv->oldlink = 0;
|
priv->oldlink = 0;
|
||||||
priv->oldspeed = 0;
|
priv->oldspeed = 0;
|
||||||
|
|
|
@ -197,9 +197,6 @@ static void mpc52xx_fec_adjust_link(struct net_device *dev)
|
||||||
if (priv->link == PHY_DOWN) {
|
if (priv->link == PHY_DOWN) {
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
priv->link = phydev->link;
|
priv->link = phydev->link;
|
||||||
netif_tx_schedule_all(dev);
|
|
||||||
netif_carrier_on(dev);
|
|
||||||
netif_start_queue(dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (priv->link) {
|
} else if (priv->link) {
|
||||||
|
@ -207,8 +204,6 @@ static void mpc52xx_fec_adjust_link(struct net_device *dev)
|
||||||
priv->link = PHY_DOWN;
|
priv->link = PHY_DOWN;
|
||||||
priv->speed = 0;
|
priv->speed = 0;
|
||||||
priv->duplex = -1;
|
priv->duplex = -1;
|
||||||
netif_stop_queue(dev);
|
|
||||||
netif_carrier_off(dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_state && netif_msg_link(priv))
|
if (new_state && netif_msg_link(priv))
|
||||||
|
|
|
@ -738,9 +738,6 @@ static void generic_adjust_link(struct net_device *dev)
|
||||||
if (!fep->oldlink) {
|
if (!fep->oldlink) {
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
fep->oldlink = 1;
|
fep->oldlink = 1;
|
||||||
netif_tx_schedule_all(dev);
|
|
||||||
netif_carrier_on(dev);
|
|
||||||
netif_start_queue(dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_state)
|
if (new_state)
|
||||||
|
@ -750,8 +747,6 @@ static void generic_adjust_link(struct net_device *dev)
|
||||||
fep->oldlink = 0;
|
fep->oldlink = 0;
|
||||||
fep->oldspeed = 0;
|
fep->oldspeed = 0;
|
||||||
fep->oldduplex = -1;
|
fep->oldduplex = -1;
|
||||||
netif_carrier_off(dev);
|
|
||||||
netif_stop_queue(dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_state && netif_msg_link(fep))
|
if (new_state && netif_msg_link(fep))
|
||||||
|
@ -826,6 +821,8 @@ static int fs_enet_open(struct net_device *dev)
|
||||||
}
|
}
|
||||||
phy_start(fep->phydev);
|
phy_start(fep->phydev);
|
||||||
|
|
||||||
|
netif_start_queue(dev);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -164,9 +164,7 @@ static void macb_handle_link_change(struct net_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (phydev->link != bp->link) {
|
if (phydev->link != bp->link) {
|
||||||
if (phydev->link)
|
if (!phydev->link) {
|
||||||
netif_tx_schedule_all(dev);
|
|
||||||
else {
|
|
||||||
bp->speed = 0;
|
bp->speed = 0;
|
||||||
bp->duplex = -1;
|
bp->duplex = -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -642,17 +642,12 @@ static void sh_eth_adjust_link(struct net_device *ndev)
|
||||||
| ECMR_DM, ioaddr + ECMR);
|
| ECMR_DM, ioaddr + ECMR);
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
mdp->link = phydev->link;
|
mdp->link = phydev->link;
|
||||||
netif_tx_schedule_all(ndev);
|
|
||||||
netif_carrier_on(ndev);
|
|
||||||
netif_start_queue(ndev);
|
|
||||||
}
|
}
|
||||||
} else if (mdp->link) {
|
} else if (mdp->link) {
|
||||||
new_state = 1;
|
new_state = 1;
|
||||||
mdp->link = PHY_DOWN;
|
mdp->link = PHY_DOWN;
|
||||||
mdp->speed = 0;
|
mdp->speed = 0;
|
||||||
mdp->duplex = -1;
|
mdp->duplex = -1;
|
||||||
netif_stop_queue(ndev);
|
|
||||||
netif_carrier_off(ndev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_state)
|
if (new_state)
|
||||||
|
|
|
@ -672,7 +672,6 @@ static void tc_handle_link_change(struct net_device *dev)
|
||||||
if (dev->flags & IFF_PROMISC)
|
if (dev->flags & IFF_PROMISC)
|
||||||
tc35815_set_multicast_list(dev);
|
tc35815_set_multicast_list(dev);
|
||||||
#endif
|
#endif
|
||||||
netif_tx_schedule_all(dev);
|
|
||||||
} else {
|
} else {
|
||||||
lp->speed = 0;
|
lp->speed = 0;
|
||||||
lp->duplex = -1;
|
lp->duplex = -1;
|
||||||
|
|
Loading…
Reference in New Issue