diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-07-22 18:41:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-22 18:41:24 -0400 |
commit | c8f15686a4b3345e3e81e09cfe191df58bbedd45 (patch) | |
tree | 1990e6281c5ced09566b093c599b7022f7bb4eb8 /drivers/net/fec_mpc52xx.c | |
parent | 3d0f24a74e7957593a5622eb5c04ed6860dd8391 (diff) |
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>
Diffstat (limited to 'drivers/net/fec_mpc52xx.c')
-rw-r--r-- | drivers/net/fec_mpc52xx.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index ae9ecb7df22b..4e4f68304e82 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
@@ -197,9 +197,6 @@ static void mpc52xx_fec_adjust_link(struct net_device *dev) | |||
197 | if (priv->link == PHY_DOWN) { | 197 | if (priv->link == PHY_DOWN) { |
198 | new_state = 1; | 198 | new_state = 1; |
199 | priv->link = phydev->link; | 199 | priv->link = phydev->link; |
200 | netif_tx_schedule_all(dev); | ||
201 | netif_carrier_on(dev); | ||
202 | netif_start_queue(dev); | ||
203 | } | 200 | } |
204 | 201 | ||
205 | } else if (priv->link) { | 202 | } else if (priv->link) { |
@@ -207,8 +204,6 @@ static void mpc52xx_fec_adjust_link(struct net_device *dev) | |||
207 | priv->link = PHY_DOWN; | 204 | priv->link = PHY_DOWN; |
208 | priv->speed = 0; | 205 | priv->speed = 0; |
209 | priv->duplex = -1; | 206 | priv->duplex = -1; |
210 | netif_stop_queue(dev); | ||
211 | netif_carrier_off(dev); | ||
212 | } | 207 | } |
213 | 208 | ||
214 | if (new_state && netif_msg_link(priv)) | 209 | if (new_state && netif_msg_link(priv)) |