diff options
| author | Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> | 2020-07-22 19:50:17 +0530 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-07-30 10:25:17 +0200 |
| commit | e61fbfca8055eef18f11727f431e1e3e5221291e (patch) | |
| tree | f640d81f69b4a48591c1b6c2e98bb1eca2968d1e /net/mac80211/tx.c | |
| parent | 4052d3d2e8f47a15053320bbcbe365d15610437d (diff) | |
| download | linux-stable-e61fbfca8055eef18f11727f431e1e3e5221291e.tar.gz linux-stable-e61fbfca8055eef18f11727f431e1e3e5221291e.tar.bz2 linux-stable-e61fbfca8055eef18f11727f431e1e3e5221291e.zip | |
mac80211: Fix bug in Tx ack status reporting in 802.3 xmit path
Allocated ack_frame id from local->ack_status_frames is not really
stored in the tx_info for 802.3 Tx path. Due to this, tx ack status
is not reported and ack_frame id is not freed for the buffers requiring
tx ack status. Also move the memset to 0 of tx_info before
IEEE80211_TX_CTL_REQ_TX_STATUS flag assignment.
Fixes: 50ff477a8639 ("mac80211: add 802.11 encapsulation offloading support")
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org>
Link: https://lore.kernel.org/r/1595427617-1713-1-git-send-email-vthiagar@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 1a2941e5244f..3529d1368068 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4230,11 +4230,12 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) goto out_free; + memset(info, 0, sizeof(*info)); + if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) - ieee80211_store_ack_skb(local, skb, &info->flags, NULL); - - memset(info, 0, sizeof(*info)); + info->ack_frame_id = ieee80211_store_ack_skb(local, skb, + &info->flags, NULL); if (unlikely(sdata->control_port_protocol == ehdr->h_proto)) { if (sdata->control_port_no_encrypt) |