Commit 4a86c546 authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Johannes Berg
Browse files

wifi: mac80211: fix link warning in RX agg timer expiry 



The rx data link pointer isn't set from the RX aggregation timer,
resulting in a later warning. Fix that by setting it to the first
valid link for now, with a FIXME to worry about statistics later,
it's not very important since it's just the timeout case.

Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/498d714c-76be-9d04-26db-a1206878de5e@redhat.com


Fixes: 56057da4 ("wifi: mac80211: rx: track link in RX data")
Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6d0ef724

net/mac80211/rx.c

+4 −0
Original line number Diff line number Diff line
@@ -4074,6 +4074,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid) 
		.link_id = -1,

	};

	struct tid_ampdu_rx *tid_agg_rx;

	u8 link_id;



	tid_agg_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);

	if (!tid_agg_rx)
@@ -4093,6 +4094,9 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid) 
		};

		drv_event_callback(rx.local, rx.sdata, &event);

	}

	/* FIXME: statistics won't be right with this */

	link_id = sta->sta.valid_links ? ffs(sta->sta.valid_links) - 1 : 0;

	rx.link = rcu_dereference(sta->sdata->link[link_id]);



	ieee80211_rx_handlers(&rx, &frames);

}