瀏覽代碼

wl12xx: set the skbuff priority for dummy packets

The firmware requires dummy packets to be sent using TID 7
(WL1271_TID_MGMT).  Instead of hardcoding it in the tx_fill_hdr()
function, set it when creating the packet itself.

This requires Eliad's fix to set the actual TID in the TX descriptor.

Cc: Ido Yariv <ido@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Luciano Coelho 14 年之前
父節點
當前提交
18b92ffaf3
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 2 0
      drivers/net/wireless/wl12xx/main.c
  2. 0 3
      drivers/net/wireless/wl12xx/tx.c

+ 2 - 0
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);
 	memset(skb->data, 0, TX_DUMMY_PACKET_SIZE);
 
 
 	skb->pkt_type = TX_PKT_TYPE_DUMMY_REQ;
 	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 */
 	/* CONF_TX_AC_VO */
 	skb->queue_mapping = 0;
 	skb->queue_mapping = 0;
 
 

+ 0 - 3
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_HW_ATTR_SESSION_COUNTER;
 
 
 		tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;
 		tx_attr |= TX_HW_ATTR_TX_DUMMY_REQ;
-
-		/* Dummy packets require the TID to be management */
-		desc->tid = WL1271_TID_MGMT;
 	} else {
 	} else {
 		/* configure the tx attributes */
 		/* configure the tx attributes */
 		tx_attr =
 		tx_attr =