ath10k: fix tx status flag setting for management frames
authorRakesh Pillai <pillair@codeaurora.org>
Thu, 6 Sep 2018 13:27:27 +0000 (18:57 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:08:25 +0000 (11:08 -0800)
[ 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 <pillair@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/ath/ath10k/wmi.c

index fd612d2..1dced0d 100644 (file)
@@ -2336,7 +2336,12 @@ static int wmi_process_mgmt_tx_comp(struct ath10k *ar, u32 desc_id,
        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;