diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-05-10 14:26:44 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-06-20 13:55:01 +0300 |
| commit | d0a9123ef548def5c8880e83e5df948eb5b55c62 (patch) | |
| tree | ed91b5f27b8fe75196e203d2776ba68116fc8650 /net/mac80211/airtime.c | |
| parent | 7b0a0e3c3a88260b6fcb017e49f198463aa62ed1 (diff) | |
| download | linux-d0a9123ef548def5c8880e83e5df948eb5b55c62.tar.xz | |
wifi: mac80211: move some future per-link data to bss_conf
To add MLD, reuse the bss_conf structure later for per-link
information, so move some things into it that are per link.
Most transformations were done with the following spatch:
@@
expression sdata;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-sdata->vif.var
+sdata->vif.bss_conf.var
@@
struct ieee80211_vif *vif;
identifier var = { chanctx_conf, mu_mimo_owner, csa_active, color_change_active, color_change_color };
@@
-vif->var
+vif->bss_conf.var
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/airtime.c')
| -rw-r--r-- | net/mac80211/airtime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c index 4bab1683652d..2e66598fac79 100644 --- a/net/mac80211/airtime.c +++ b/net/mac80211/airtime.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: ISC /* * Copyright (C) 2019 Felix Fietkau <nbd@nbd.name> - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation */ #include <net/mac80211.h> @@ -637,7 +637,7 @@ u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw, len += 38; /* Ethernet header length */ - conf = rcu_dereference(vif->chanctx_conf); + conf = rcu_dereference(vif->bss_conf.chanctx_conf); if (conf) { band = conf->def.chan->band; shift = ieee80211_chandef_get_shift(&conf->def); |