Having drivers start queues is just confusing, their ->start()
callback can block and do whatever is necessary, so let mac80211
start queues and have drivers wake queues when necessary (to get
packets flowing again right away.)
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
---
drivers/net/wireless/adm8211.c | 2 +-
drivers/net/wireless/at76_usb.c | 4 ++--
drivers/net/wireless/ath5k/base.c | 2 +-
drivers/net/wireless/b43/main.c | 1 -
drivers/net/wireless/b43legacy/main.c | 1 -
drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 +-
drivers/net/wireless/p54/p54common.c | 3 ---
drivers/net/wireless/p54/p54pci.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 4 ++--
include/net/mac80211.h | 8 --------
net/mac80211/main.c | 8 +++++++-
net/mac80211/util.c | 12 ------------
13 files changed, 16 insertions(+), 35 deletions(-)
--- everything.orig/drivers/net/wireless/adm8211.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/adm8211.c 2008-05-15 12:02:37.000000000 +0200
@@ -2015,7 +2015,7 @@ static int adm8211_resume(struct pci_dev
if (priv->mode != IEEE80211_IF_TYPE_INVALID) {
adm8211_start(dev);
- ieee80211_start_queues(dev);
+ ieee80211_wake_queues(dev);
}
return 0;
--- everything.orig/drivers/net/wireless/at76_usb.c 2008-05-15 11:22:49.000000000 +0200
+++ everything/drivers/net/wireless/at76_usb.c 2008-05-15 12:02:37.000000000 +0200
@@ -1720,7 +1720,7 @@ static void at76_mac80211_tx_callback(st
memset(&priv->tx_status, 0, sizeof(priv->tx_status));
priv->tx_skb = NULL;
- ieee80211_start_queues(priv->hw);
+ ieee80211_wake_queues(priv->hw);
}
static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
@@ -1918,7 +1918,7 @@ static void at76_dwork_hw_scan(struct wo
if (is_valid_ether_addr(priv->bssid))
at76_join(priv);
- ieee80211_start_queues(priv->hw);
+ ieee80211_wake_queues(priv->hw);
exit:
mutex_unlock(&priv->mtx);
--- everything.orig/drivers/net/wireless/ath5k/base.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/ath5k/base.c 2008-05-15 12:02:37.000000000 +0200
@@ -1599,7 +1599,7 @@ ath5k_txq_cleanup(struct ath5k_softc *sc
sc->txqs[i].link);
}
}
- ieee80211_start_queues(sc->hw); /* XXX move to callers */
+ ieee80211_wake_queues(sc->hw); /* XXX move to callers */
for (i = 0; i < ARRAY_SIZE(sc->txqs); i++)
if (sc->txqs[i].setup)
--- everything.orig/drivers/net/wireless/b43/main.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/b43/main.c 2008-05-15 12:02:37.000000000 +0200
@@ -3497,7 +3497,6 @@ static int b43_wireless_core_start(struc
/* Start data flow (TX/RX). */
b43_mac_enable(dev);
b43_interrupt_enable(dev, dev->irq_savedstate);
- ieee80211_start_queues(dev->wl->hw);
/* Start maintainance work */
b43_periodic_tasks_setup(dev);
--- everything.orig/drivers/net/wireless/b43legacy/main.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/b43legacy/main.c 2008-05-15 12:02:37.000000000 +0200
@@ -2794,7 +2794,6 @@ static int b43legacy_wireless_core_start
/* Start data flow (TX/RX) */
b43legacy_mac_enable(dev);
b43legacy_interrupt_enable(dev, dev->irq_savedstate);
- ieee80211_start_queues(dev->wl->hw);
/* Start maintenance work */
b43legacy_periodic_tasks_setup(dev);
--- everything.orig/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-05-15 11:54:59.000000000 +0200
+++ everything/drivers/net/wireless/iwlwifi/iwl3945-base.c 2008-05-15 12:02:37.000000000 +0200
@@ -5823,7 +5823,7 @@ static void iwl3945_alive_start(struct i
if (iwl3945_is_rfkill(priv))
return;
- ieee80211_start_queues(priv->hw);
+ ieee80211_wake_queues(priv->hw);
priv->active_rate = priv->rates_mask;
priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
--- everything.orig/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-05-15 11:55:05.000000000 +0200
+++ everything/drivers/net/wireless/iwlwifi/iwl4965-base.c 2008-05-15 12:02:37.000000000 +0200
@@ -3367,7 +3367,7 @@ static void iwl4965_alive_start(struct i
if (iwl_is_rfkill(priv))
return;
- ieee80211_start_queues(priv->hw);
+ ieee80211_wake_queues(priv->hw);
priv->active_rate = priv->rates_mask;
priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
--- everything.orig/drivers/net/wireless/p54/p54common.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/p54/p54common.c 2008-05-15 12:02:37.000000000 +0200
@@ -375,9 +375,6 @@ static void inline p54_wake_free_queues(
struct p54_common *priv = dev->priv;
int i;
- /* ieee80211_start_queues is great if all queues are really empty.
- * But, what if some are full? */
-
for (i = 0; i < dev->queues; i++)
if (priv->tx_stats[i].len < priv->tx_stats[i].limit)
ieee80211_wake_queue(dev, i);
--- everything.orig/drivers/net/wireless/p54/p54pci.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/p54/p54pci.c 2008-05-15 12:02:37.000000000 +0200
@@ -665,7 +665,7 @@ static int p54p_resume(struct pci_dev *p
if (priv->common.mode != IEEE80211_IF_TYPE_INVALID) {
p54p_open(dev);
- ieee80211_start_queues(dev);
+ ieee80211_wake_queues(dev);
}
return 0;
--- everything.orig/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-05-15 11:22:50.000000000 +0200
+++ everything/drivers/net/wireless/rt2x00/rt2x00dev.c 2008-05-15 12:02:37.000000000 +0200
@@ -125,7 +125,7 @@ int rt2x00lib_enable_radio(struct rt2x00
/*
* Start the TX queues.
*/
- ieee80211_start_queues(rt2x00dev->hw);
+ ieee80211_wake_queues(rt2x00dev->hw);
return 0;
}
@@ -1186,7 +1186,7 @@ int rt2x00lib_resume(struct rt2x00_dev *
* In that case we have disabled the TX queue and should
* now enable it again
*/
- ieee80211_start_queues(rt2x00dev->hw);
+ ieee80211_wake_queues(rt2x00dev->hw);
/*
* During interface iteration we might have changed the
--- everything.orig/net/mac80211/util.c 2008-05-15 12:02:36.000000000 +0200
+++ everything/net/mac80211/util.c 2008-05-15 12:02:37.000000000 +0200
@@ -350,18 +350,6 @@ void ieee80211_stop_queue(struct ieee802
}
EXPORT_SYMBOL(ieee80211_stop_queue);
-void ieee80211_start_queues(struct ieee80211_hw *hw)
-{
- struct ieee80211_local *local = hw_to_local(hw);
- int i;
-
- for (i = 0; i < hw->queues + hw->ampdu_queues; i++)
- clear_bit(IEEE80211_LINK_STATE_XOFF, &local->state[i]);
- if (!ieee80211_qdisc_installed(local->mdev))
- netif_start_queue(local->mdev);
-}
-EXPORT_SYMBOL(ieee80211_start_queues);
-
void ieee80211_stop_queues(struct ieee80211_hw *hw)
{
int i;
--- everything.orig/include/net/mac80211.h 2008-05-15 11:22:49.000000000 +0200
+++ everything/include/net/mac80211.h 2008-05-15 12:02:38.000000000 +0200
@@ -1567,14 +1567,6 @@ void ieee80211_wake_queue(struct ieee802
void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue);
/**
- * ieee80211_start_queues - start all queues
- * @hw: pointer to as obtained from ieee80211_alloc_hw().
- *
- * Drivers should use this function instead of netif_start_queue.
- */
-void ieee80211_start_queues(struct ieee80211_hw *hw);
-
-/**
* ieee80211_stop_queues - stop all queues
* @hw: pointer as obtained from ieee80211_alloc_hw().
*
--- everything.orig/net/mac80211/main.c 2008-05-15 12:01:29.000000000 +0200
+++ everything/net/mac80211/main.c 2008-05-15 12:02:38.000000000 +0200
@@ -110,7 +110,13 @@ static int ieee80211_master_open(struct
break;
}
}
- return res;
+
+ if (res)
+ return res;
+
+ netif_start_queue(local->mdev);
+
+ return 0;
}
static int ieee80211_master_stop(struct net_device *dev)
--
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
