mac80211: make uapsd_* keys per-vif

uapsd_queues and uapsd_max_sp_len are relevant only for managed
interfaces, and can be configured differently for each vif.

Move them from the local struct to sdata->u.mgd, and update
the debugfs functions accordingly.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d9e791d2b543..782a60198df4 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -226,12 +226,12 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
          * have correct qos tag for some reason, due the network or the
          * peer application.
          *
-         * Note: local->uapsd_queues access is racy here. If the value is
+         * Note: ifmgd->uapsd_queues access is racy here. If the value is
          * changed via debugfs, user needs to reassociate manually to have
          * everything in sync.
          */
         if ((ifmgd->flags & IEEE80211_STA_UAPSD_ENABLED)
-            && (local->uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
+            && (ifmgd->uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
             && skb_get_queue_mapping(tx->skb) == 0)
                 return TX_CONTINUE;