diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-15 06:47:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-17 22:21:15 -0400 |
commit | 263ba3204a434d0ca851e1321b31cd58376b86cb (patch) | |
tree | 1ede30ac6cc3968e3595562040d824027bd7dd23 | |
parent | 8f0f2223cc08a5ae9a77f40edfe02e8a9f1abd77 (diff) |
netdev: Convert all drivers away from netif_schedule().
They logically all want to trigger a schedule for all device
TX queues.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/au1000_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/bfin_mac.c | 2 | ||||
-rw-r--r-- | drivers/net/fec_mpc52xx.c | 2 | ||||
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 2 | ||||
-rw-r--r-- | drivers/net/gianfar.c | 4 | ||||
-rw-r--r-- | drivers/net/macb.c | 2 | ||||
-rw-r--r-- | drivers/net/sh_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/tc35815.c | 2 | ||||
-rw-r--r-- | drivers/net/ucc_geth.c | 4 |
9 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 7023d77bf380..3ab61e40e86a 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -912,7 +912,7 @@ au1000_adjust_link(struct net_device *dev) | |||
912 | // link state changed | 912 | // link state changed |
913 | 913 | ||
914 | if (phydev->link) // link went up | 914 | if (phydev->link) // link went up |
915 | netif_schedule(dev); | 915 | netif_tx_schedule_all(dev); |
916 | else { // link went down | 916 | else { // link went down |
917 | aup->old_speed = 0; | 917 | aup->old_speed = 0; |
918 | aup->old_duplex = -1; | 918 | aup->old_duplex = -1; |
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 41443435ab1c..a6a3da89f590 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -357,7 +357,7 @@ static void bfin_mac_adjust_link(struct net_device *dev) | |||
357 | if (!lp->old_link) { | 357 | if (!lp->old_link) { |
358 | new_state = 1; | 358 | new_state = 1; |
359 | lp->old_link = 1; | 359 | lp->old_link = 1; |
360 | netif_schedule(dev); | 360 | netif_tx_schedule_all(dev); |
361 | } | 361 | } |
362 | } else if (lp->old_link) { | 362 | } else if (lp->old_link) { |
363 | new_state = 1; | 363 | new_state = 1; |
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 329edd9c08fc..ae9ecb7df22b 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
@@ -197,7 +197,7 @@ 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_schedule(dev); | 200 | netif_tx_schedule_all(dev); |
201 | netif_carrier_on(dev); | 201 | netif_carrier_on(dev); |
202 | netif_start_queue(dev); | 202 | netif_start_queue(dev); |
203 | } | 203 | } |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index fb7c47790bd6..bdb81f5750ad 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -738,7 +738,7 @@ 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_schedule(dev); | 741 | netif_tx_schedule_all(dev); |
742 | netif_carrier_on(dev); | 742 | netif_carrier_on(dev); |
743 | netif_start_queue(dev); | 743 | netif_start_queue(dev); |
744 | } | 744 | } |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index fa78d6870124..45a63172852f 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -1234,7 +1234,7 @@ static void gfar_timeout(struct net_device *dev) | |||
1234 | startup_gfar(dev); | 1234 | startup_gfar(dev); |
1235 | } | 1235 | } |
1236 | 1236 | ||
1237 | netif_schedule(dev); | 1237 | netif_tx_schedule_all(dev); |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | /* Interrupt Handler for Transmit complete */ | 1240 | /* Interrupt Handler for Transmit complete */ |
@@ -1725,7 +1725,7 @@ static void adjust_link(struct net_device *dev) | |||
1725 | if (!priv->oldlink) { | 1725 | if (!priv->oldlink) { |
1726 | new_state = 1; | 1726 | new_state = 1; |
1727 | priv->oldlink = 1; | 1727 | priv->oldlink = 1; |
1728 | netif_schedule(dev); | 1728 | netif_tx_schedule_all(dev); |
1729 | } | 1729 | } |
1730 | } else if (priv->oldlink) { | 1730 | } else if (priv->oldlink) { |
1731 | new_state = 1; | 1731 | new_state = 1; |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index e34630252cef..50688a52658e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -165,7 +165,7 @@ static void macb_handle_link_change(struct net_device *dev) | |||
165 | 165 | ||
166 | if (phydev->link != bp->link) { | 166 | if (phydev->link != bp->link) { |
167 | if (phydev->link) | 167 | if (phydev->link) |
168 | netif_schedule(dev); | 168 | netif_tx_schedule_all(dev); |
169 | else { | 169 | else { |
170 | bp->speed = 0; | 170 | bp->speed = 0; |
171 | bp->duplex = -1; | 171 | bp->duplex = -1; |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 37f3116ea6bd..a4bc812aa999 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
@@ -642,7 +642,7 @@ 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_schedule(ndev); | 645 | netif_tx_schedule_all(ndev); |
646 | netif_carrier_on(ndev); | 646 | netif_carrier_on(ndev); |
647 | netif_start_queue(ndev); | 647 | netif_start_queue(ndev); |
648 | } | 648 | } |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index b07b8cbadeaf..41d3ac45685f 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -672,7 +672,7 @@ static void tc_handle_link_change(struct net_device *dev) | |||
672 | if (dev->flags & IFF_PROMISC) | 672 | if (dev->flags & IFF_PROMISC) |
673 | tc35815_set_multicast_list(dev); | 673 | tc35815_set_multicast_list(dev); |
674 | #endif | 674 | #endif |
675 | netif_schedule(dev); | 675 | netif_tx_schedule_all(dev); |
676 | } else { | 676 | } else { |
677 | lp->speed = 0; | 677 | lp->speed = 0; |
678 | lp->duplex = -1; | 678 | lp->duplex = -1; |
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 07933f71b86d..c1b55bc7eab7 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -1588,7 +1588,7 @@ static void adjust_link(struct net_device *dev) | |||
1588 | if (!ugeth->oldlink) { | 1588 | if (!ugeth->oldlink) { |
1589 | new_state = 1; | 1589 | new_state = 1; |
1590 | ugeth->oldlink = 1; | 1590 | ugeth->oldlink = 1; |
1591 | netif_schedule(dev); | 1591 | netif_tx_schedule_all(dev); |
1592 | } | 1592 | } |
1593 | } else if (ugeth->oldlink) { | 1593 | } else if (ugeth->oldlink) { |
1594 | new_state = 1; | 1594 | new_state = 1; |
@@ -3372,7 +3372,7 @@ static void ucc_geth_timeout(struct net_device *dev) | |||
3372 | ucc_geth_startup(ugeth); | 3372 | ucc_geth_startup(ugeth); |
3373 | } | 3373 | } |
3374 | 3374 | ||
3375 | netif_schedule(dev); | 3375 | netif_tx_schedule_all(dev); |
3376 | } | 3376 | } |
3377 | 3377 | ||
3378 | /* This is called by the kernel when a frame is ready for transmission. */ | 3378 | /* This is called by the kernel when a frame is ready for transmission. */ |