aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fs_enet
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-07-22 18:41:24 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-22 18:41:24 -0400
commitc8f15686a4b3345e3e81e09cfe191df58bbedd45 (patch)
tree1990e6281c5ced09566b093c599b7022f7bb4eb8 /drivers/net/fs_enet
parent3d0f24a74e7957593a5622eb5c04ed6860dd8391 (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/fs_enet')
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 445763e5648e..52911889fd12 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -738,9 +738,6 @@ static void generic_adjust_link(struct net_device *dev)
738 if (!fep->oldlink) { 738 if (!fep->oldlink) {
739 new_state = 1; 739 new_state = 1;
740 fep->oldlink = 1; 740 fep->oldlink = 1;
741 netif_tx_schedule_all(dev);
742 netif_carrier_on(dev);
743 netif_start_queue(dev);
744 } 741 }
745 742
746 if (new_state) 743 if (new_state)
@@ -750,8 +747,6 @@ static void generic_adjust_link(struct net_device *dev)
750 fep->oldlink = 0; 747 fep->oldlink = 0;
751 fep->oldspeed = 0; 748 fep->oldspeed = 0;
752 fep->oldduplex = -1; 749 fep->oldduplex = -1;
753 netif_carrier_off(dev);
754 netif_stop_queue(dev);
755 } 750 }
756 751
757 if (new_state && netif_msg_link(fep)) 752 if (new_state && netif_msg_link(fep))
@@ -826,6 +821,8 @@ static int fs_enet_open(struct net_device *dev)
826 } 821 }
827 phy_start(fep->phydev); 822 phy_start(fep->phydev);
828 823
824 netif_start_queue(dev);
825
829 return 0; 826 return 0;
830} 827}
831 828