From a6133ff023de526785c7b59a628206a159c48411 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Wed, 16 Mar 2011 23:03:54 +0200 Subject: [PATCH] --- yaml --- r: 247105 b: refs/heads/master c: db674d249c1fa20fd6731048f41646b3a2e8bdf5 h: refs/heads/master i: 247103: 09bfc6e24fd2f478b8ebe837e4cf89c68a72df28 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/tx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f7b3b13f4a81..f97d6163225a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9f774c17e19da6f98bd7b57527f55d0ec920fce +refs/heads/master: db674d249c1fa20fd6731048f41646b3a2e8bdf5 diff --git a/trunk/drivers/net/wireless/wl12xx/tx.c b/trunk/drivers/net/wireless/wl12xx/tx.c index 109878c3246e..f3031cdd173e 100644 --- a/trunk/drivers/net/wireless/wl12xx/tx.c +++ b/trunk/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) { /*