mac80211: handle non-bufferable MMPDUs correctly

This renames the IEEE80211_TX_CTL_POLL_RESPONSE
TX flag to IEEE80211_TX_CTL_NO_PS_BUFFER and also
uses it for non-bufferable MMPDUs (all MMPDUs but
deauth, disassoc and action frames.)

Previously, mac80211 would let the MMPDU through
but not set the flag so drivers supporting some
hardware aids for avoiding the PS races would
then reject the frame.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 7 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 2d01db0f08e0..2329033e23d7 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -1693,7 +1693,7 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
                 sta_priv = (void *)sta->drv_priv;
 
         if (sta_priv && sta_priv->asleep &&
-            (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
+            (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
                 /*
                  * This sends an asynchronous command to the device,
                  * but we can rely on it being processed before the
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index da18a8fc9af7..5f78567f4180 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -322,7 +322,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                 sta_priv = (void *)info->control.sta->drv_priv;
 
         if (sta_priv && sta_priv->asleep &&
-            (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
+            (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
                 /*
                  * This sends an asynchronous command to the device,
                  * but we can rely on it being processed before the
@@ -331,6 +331,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                  * counter.
                  * For now set the counter to just 1 since we do not
                  * support uAPSD yet.
+                 *
+                 * FIXME: If we get two non-bufferable frames one
+                 * after the other, we might only send out one of
+                 * them because this is racy.
                  */
                 iwl_sta_modify_sleep_tx_count(priv, sta_id, 1);
         }
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 42b97bc38477..a08a6f0e4dd1 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -690,7 +690,7 @@ static void p54_tx_80211_header(struct p54_common *priv, struct sk_buff *skb,
         if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
                 *flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
 
-        if (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)
+        if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
                 *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL;
 
         if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)