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>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 72e84a209e6c85011174aaec544abdf22f68ff8f..59e0f79e3998f8777a2ab2f932f4f41f02d0a0b0 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/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/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index f3031cdd173ec9bbd58fa5a964f20686f2b000eb..db9e47e09fba976e99b429a79732ce8b967e1462 100644 (file)
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/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 =