4.19-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Rakesh Pillai <[email protected]>

[ Upstream commit 058a7eab9d9ee12f57282eb0b606668dada70d7a ]

The tx_status for management frames is being filled
incorrectly in the flags of skb_cb. This incorrect
flag setting causes the upper layers to consider that
the particular frame was not transmitted properly,
leading to improper behavior.

Set the IEEE80211_TX_STAT_ACK flag in the info flags
of skb_cb, to indicate the successful transmission of
the management frame.

Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1

Fixes: dc405152bb64d4ae01c9ac669de25b2d1fb6fc2d
Signed-off-by: Rakesh Pillai <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/net/wireless/ath/ath10k/wmi.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2336,7 +2336,12 @@ static int wmi_process_mgmt_tx_comp(stru
        dma_unmap_single(ar->dev, pkt_addr->paddr,
                         msdu->len, DMA_FROM_DEVICE);
        info = IEEE80211_SKB_CB(msdu);
-       info->flags |= status;
+
+       if (status)
+               info->flags &= ~IEEE80211_TX_STAT_ACK;
+       else
+               info->flags |= IEEE80211_TX_STAT_ACK;
+
        ieee80211_tx_status_irqsafe(ar->hw, msdu);
 
        ret = 0;


Reply via email to