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/sh_eth.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/sh_eth.c')
-rw-r--r-- | drivers/net/sh_eth.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index a4bc812aa999..c69ba1395fa9 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -642,17 +642,12 @@ static void sh_eth_adjust_link(struct net_device *ndev) | |||
642 | | ECMR_DM, ioaddr + ECMR); | 642 | | ECMR_DM, ioaddr + ECMR); |
643 | new_state = 1; | 643 | new_state = 1; |
644 | mdp->link = phydev->link; | 644 | mdp->link = phydev->link; |
645 | netif_tx_schedule_all(ndev); | ||
646 | netif_carrier_on(ndev); | ||
647 | netif_start_queue(ndev); | ||
648 | } | 645 | } |
649 | } else if (mdp->link) { | 646 | } else if (mdp->link) { |
650 | new_state = 1; | 647 | new_state = 1; |
651 | mdp->link = PHY_DOWN; | 648 | mdp->link = PHY_DOWN; |
652 | mdp->speed = 0; | 649 | mdp->speed = 0; |
653 | mdp->duplex = -1; | 650 | mdp->duplex = -1; |
654 | netif_stop_queue(ndev); | ||
655 | netif_carrier_off(ndev); | ||
656 | } | 651 | } |
657 | 652 | ||
658 | if (new_state) | 653 | if (new_state) |