diff --git a/[refs] b/[refs]
index cf4baa926246..5043541cf39e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8bf65bf3688835f95f7c74f5c844a64b2743a42
+refs/heads/master: 353d09c6ceedc1cb0c54fe5002c0ca80b6ee6e4f
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index e453212fa17f..85cf32d2f7b5 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -2733,7 +2733,7 @@ EXPORT_SYMBOL(ieee80211_get_buffered_bc);
 void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,
 			  struct sk_buff *skb, int tid)
 {
-	int ac = ieee802_1d_to_ac[tid];
+	int ac = ieee802_1d_to_ac[tid & 7];
 
 	skb_set_mac_header(skb, 0);
 	skb_set_network_header(skb, 0);