mac80211: Fix bug in Tx ack status reporting in 802.3 xmit path
PATCH 1/1 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 <[email protected]>
--- net/mac80211/tx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/mac80211/tx.c +4 -3
@@ -4227,11 +4227,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)
Signature · 1 line
2.7.4