diff --git a/[refs] b/[refs]
index 5168c172017a..fe0c2c33a056 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 429a380571a6e6b8525b93161544eafc9b227e44
+refs/heads/master: d96a7bc0499d0332cecb0a1d7d7d0d44f9c8cc28
diff --git a/trunk/net/mac80211/wme.c b/trunk/net/mac80211/wme.c
index ffe1af82fa4d..a1a53a4f2b99 100644
--- a/trunk/net/mac80211/wme.c
+++ b/trunk/net/mac80211/wme.c
@@ -210,7 +210,6 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
 			kfree_skb(skb);
 			err = NET_XMIT_DROP;
 	} else {
-		tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
 		skb_set_queue_mapping(skb, queue);
 		qdisc = q->queues[queue];
 		err = qdisc->enqueue(skb, qdisc);