From 5df3f4aa40cb2b655995a31303e8f17d6d2aff72 Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Wed, 1 Sep 2010 11:31:11 +0200
Subject: [PATCH] --- yaml --- r: 215047 b: refs/heads/master c:
 ed484a16b495ee7e13cb28fd6ff6053d10657633 h: refs/heads/master i:   215045:
 21a19b7891a7613023b09b35e14782a272e65dc3   215043:
 bb9e04197ecc378f1bb6afcd5efee85a4c9b5925   215039:
 452be467ba771d1d3d8e62d93b5ba6c67e06f741 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_tx.c |  4 ++--
 trunk/drivers/net/wireless/wl12xx/wl1271_tx.h | 17 -----------------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index c0721e6676dc..1375812315a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11eb54298fa7197cb4187f8a3474ead0709f76ff
+refs/heads/master: ed484a16b495ee7e13cb28fd6ff6053d10657633
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c
index 0f99eff3b7ef..1b8295c5dde4 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -110,9 +110,9 @@ static int wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
 	/* configure the tx attributes */
 	tx_attr = wl->session_counter << TX_HW_ATTR_OFST_SESSION_COUNTER;
 
-	/* queue */
+	/* queue (we use same identifiers for tid's and ac's */
 	ac = wl1271_tx_get_queue(skb_get_queue_mapping(skb));
-	desc->tid = wl1271_tx_ac_to_tid(ac);
+	desc->tid = ac;
 
 	desc->aid = TX_HW_DEFAULT_AID;
 	desc->reserved = 0;
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.h b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.h
index 48bf92621c03..d12a129ad11c 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.h
@@ -139,23 +139,6 @@ static inline int wl1271_tx_get_queue(int queue)
 	}
 }
 
-/* wl1271 tx descriptor needs the tid and we need to convert it from ac */
-static inline int wl1271_tx_ac_to_tid(int ac)
-{
-	switch (ac) {
-	case 0:
-		return 0;
-	case 1:
-		return 2;
-	case 2:
-		return 4;
-	case 3:
-		return 6;
-	default:
-		return 0;
-	}
-}
-
 void wl1271_tx_work(struct work_struct *work);
 void wl1271_tx_complete(struct wl1271 *wl);
 void wl1271_tx_reset(struct wl1271 *wl);