diff options
author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:43:52 +0300 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 20:49:36 +0300 |
commit | 10f5ae21940cc754f82828d81b8009f2e8ae2c64 (patch) | |
tree | 8156f045504a2f9e1d767b0af6f89b19a4de2e52 /net/mac80211/ieee80211_i.h | |
parent | 7d528eafc5290bed18551a22ff25ce8587b603e0 (diff) | |
parent | f7e60032c6618dfd643c7210d5cba2789e2de2e2 (diff) | |
download | linux-10f5ae21940cc754f82828d81b8009f2e8ae2c64.tar.xz |
Merge wireless into wireless-next
There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 865210726d54..037040787194 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -2541,7 +2541,8 @@ int ieee80211_chanctx_refcount(struct ieee80211_local *local, void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, struct ieee80211_chanctx *chanctx); void ieee80211_recalc_chanctx_min_def(struct ieee80211_local *local, - struct ieee80211_chanctx *ctx); + struct ieee80211_chanctx *ctx, + struct ieee80211_link_data *rsvd_for); bool ieee80211_is_radar_required(struct ieee80211_local *local); void ieee80211_dfs_cac_timer(unsigned long data); |