diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-03-21 16:35:21 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-04-19 16:49:09 +0300 |
| commit | 18b92ffaf33c862e852992e82e17b9fffca8d5a4 (patch) | |
| tree | c2d4474ae12d639974af8efcb0ab043c21a1b3d4 | |
| parent | db674d249c1fa20fd6731048f41646b3a2e8bdf5 (diff) | |
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>
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/tx.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 72e84a209e6c..59e0f79e3998 100644 --- 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 f3031cdd173e..db9e47e09fba 100644 --- 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 = |