Commit e61fbfca authored Jul 22, 2020 by Vasanthakumar Thiagarajan Committed by Johannes Berg Jul 30, 2020

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: 50ff477a ("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>

parent 4052d3d2

net/mac80211/tx.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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)