From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 6 Sep 2022 08:08:37 +0000 (+0200)
Subject: wifi: mac80211: set link_sta in reorder timeout
X-Git-Tag: block-6.1-2022-13-10~73^2~30^2~147
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e95a7f3ddc1b47838e5c131f77eb9525724c3e73;p=linux-block.git

wifi: mac80211: set link_sta in reorder timeout

Now that we have a link_sta pointer in the rx struct
we also need to fill it in all the cases. It didn't
matter so much until now as we weren't using it, but
the code should really be able to assume that if the
rx.sta is set, so is rx.link_sta.

Fixes: ccdde7c74ffd ("wifi: mac80211: properly implement MLO key handling")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 511c809e2c6b..04f16eabb78f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4107,6 +4107,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
 	/* 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]);
+	rx.link_sta = rcu_dereference(sta->link[link_id]);
 
 	ieee80211_rx_handlers(&rx, &frames);
 }