From 41470c74b90c1aecc029f81c45dbf007562e9fba Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Mon, 21 Mar 2011 16:35:21 +0200
Subject: [PATCH] --- yaml --- r: 247106 b: refs/heads/master c:
 18b92ffaf33c862e852992e82e17b9fffca8d5a4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f97d6163225a..c05140270de8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db674d249c1fa20fd6731048f41646b3a2e8bdf5
+refs/heads/master: 18b92ffaf33c862e852992e82e17b9fffca8d5a4
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 72e84a209e6c..59e0f79e3998 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -1243,6 +1243,8 @@ int wl1271_tx_dummy_packet(struct wl1271 *wl)
 	memset(skb->data, 0, TX_DUMMY_PACKET_SIZE);
 
 	skb->pkt_type = TX_PKT_TYPE_DUMMY_REQ;
+	/* Dummy packets require the TID to be management */
+	skb->priority = WL1271_TID_MGMT;
 	/* CONF_TX_AC_VO */
 	skb->queue_mapping = 0;
 
diff --git a/trunk/drivers/net/wireless/wl12xx/tx.c b/trunk/drivers/net/wireless/wl12xx/tx.c
index f3031cdd173e..db9e47e09fba 100644
--- a/trunk/drivers/net/wireless/wl12xx/tx.c
+++ b/trunk/drivers/net/wireless/wl12xx/tx.c
@@ -235,9 +235,6 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct sk_buff *skb,
 			   TX_HW_ATTR_SESSION_COUNTER;
 
 		tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;
-
-		/* Dummy packets require the TID to be management */
-		desc->tid = WL1271_TID_MGMT;
 	} else {
 		/* configure the tx attributes */
 		tx_attr =