diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 19:43:52 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 19:49:36 +0200 |
| commit | 10f5ae21940cc754f82828d81b8009f2e8ae2c64 (patch) | |
| tree | 8156f045504a2f9e1d767b0af6f89b19a4de2e52 /net/mac80211/util.c | |
| parent | 7d528eafc5290bed18551a22ff25ce8587b603e0 (diff) | |
| parent | f7e60032c6618dfd643c7210d5cba2789e2de2e2 (diff) | |
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/util.c')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index a027b9e24160..4f29c307b3f6 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -3097,7 +3097,7 @@ void ieee80211_recalc_min_chandef(struct ieee80211_sub_if_data *sdata, chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf); - ieee80211_recalc_chanctx_min_def(local, chanctx); + ieee80211_recalc_chanctx_min_def(local, chanctx, NULL); } unlock: mutex_unlock(&local->chanctx_mtx); |