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/cpmac.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/cpmac.c')
-rw-r--r-- | drivers/net/cpmac.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index fbd4280c102c..a7800e559090 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
@@ -945,10 +945,8 @@ static void cpmac_adjust_link(struct net_device *dev) | |||
945 | if (!priv->oldlink) { | 945 | if (!priv->oldlink) { |
946 | new_state = 1; | 946 | new_state = 1; |
947 | priv->oldlink = 1; | 947 | priv->oldlink = 1; |
948 | netif_tx_schedule_all(dev); | ||
949 | } | 948 | } |
950 | } else if (priv->oldlink) { | 949 | } else if (priv->oldlink) { |
951 | netif_tx_stop_all_queues(dev); | ||
952 | new_state = 1; | 950 | new_state = 1; |
953 | priv->oldlink = 0; | 951 | priv->oldlink = 0; |
954 | priv->oldspeed = 0; | 952 | priv->oldspeed = 0; |