diff options
author | David S. Miller <davem@davemloft.net> | 2020-05-26 20:17:35 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-05-26 20:17:35 -0700 |
commit | 745bd6f44cd3413f429ed3e2c7744c8abf8630d5 (patch) | |
tree | 29ccc5ac8cb3faca99f132e85fcb0b382e7cdcb1 /net/mac80211/ibss.c | |
parent | 0e3481195b155da4b9b94ad4d64bbf531ce62d16 (diff) | |
parent | 60689de46c7f6a0028c8b37b6f03db68cbfad8ed (diff) | |
download | linux-745bd6f44cd3413f429ed3e2c7744c8abf8630d5.tar.gz linux-745bd6f44cd3413f429ed3e2c7744c8abf8630d5.tar.bz2 linux-745bd6f44cd3413f429ed3e2c7744c8abf8630d5.zip |
Merge tag 'mac80211-next-for-net-next-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
One batch of changes, containing:
* hwsim improvements from Jouni and myself, to be able to
test more scenarios easily
* some more HE (802.11ax) support
* some initial S1G (sub 1 GHz) work for fractional MHz channels
* some (action) frame registration updates to help DPP support
* along with other various improvements/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index d40744903fa9..2479cd48fed0 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1758,6 +1758,11 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, int i; int ret; + if (params->chandef.chan->freq_offset) { + /* this may work, but is untested */ + return -EOPNOTSUPP; + } + ret = cfg80211_chandef_dfs_required(local->hw.wiphy, ¶ms->chandef, sdata->wdev.iftype); |