Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 60c4dbf9262511653c86467bf6a9551682954c38..fb6e511ee0be0a21bce4035b62237cb42092342b 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3301,9 +3301,11 @@ void ieee80211_init_tx_queue(struct ieee80211_sub_if_data *sdata,
        if (sta) {
                txqi->txq.sta = &sta->sta;
                sta->sta.txq[tid] = &txqi->txq;
+               txqi->txq.tid = tid;
                txqi->txq.ac = ieee802_1d_to_ac[tid & 7];
        } else {
                sdata->vif.txq = &txqi->txq;
+               txqi->txq.tid = 0;
                txqi->txq.ac = IEEE80211_AC_BE;
        }
 }