From: Eliad Peller <eliad@wizery.com>
Date: Wed, 16 Mar 2011 21:03:54 +0000 (+0200)
Subject: wl12xx: set the actual tid instead of the ac
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=db674d249c1fa20fd6731048f41646b3a2e8bdf5;p=openwrt%2Fstaging%2Fblogic.git

wl12xx: set the actual tid instead of the ac

When passing a tx frame, the driver incorrectly set desc->tid
with the ac instead of the actual tid.

It has some serious implications when using 802.11n + QoS,
as the fw starts a BlockAck with the wrong tid (which finally
cause beacon loss and disconnection / some fw crash)

Fix it by using the actual tid stored in skb->priority.

Reported-by: Shahar Levi <shahar_levi@ti.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
---

diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index 109878c3246e..f3031cdd173e 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -221,9 +221,9 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
 	else
 		desc->life_time = cpu_to_le16(TX_HW_AP_MODE_PKT_LIFETIME_TU);
 
-	/* queue (we use same identifiers for tid's and ac's */
+	/* queue */
 	ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
-	desc->tid = ac;
+	desc->tid = skb->priority;
 
 	if (skb->pkt_type == TX_PKT_TYPE_DUMMY_REQ) {
 		/*