diff options
| author |  Johannes Berg <johannes.berg@intel.com>
| 2022-09-06 10:05:29 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com>
| 2022-09-06 10:05:39 +0200 |
| commit | b38d15294ffe9b87b092d310f321e2d0a9d2b3b2 (patch) | |
| tree | c66f472d033cfbad5b18628d9a2ae52cd25cd9df /net/mac80211/rx.c | |
| parent | Merge tag 'wireless-next-2022-09-03' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | wifi: use struct_group to copy addresses (diff) | |
| download | linux-b38d15294ffe9b87b092d310f321e2d0a9d2b3b2.tar.gz linux-b38d15294ffe9b87b092d310f321e2d0a9d2b3b2.tar.bz2 linux-b38d15294ffe9b87b092d310f321e2d0a9d2b3b2.zip | |
Merge remote-tracking branch 'wireless/main' into wireless-next
Merge wireless/main to get the rx.link fix, which is needed
for further work in this area.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index cc139fe5fb78..511c809e2c6b 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -4084,6 +4084,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) @@ -4103,6 +4104,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); } |