Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b42aab1 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Johannes Berg
Browse files

mac80211: return if IBSS chandef can not be used 



This was originally designed to fail when a 40+/40- mode can not be
used, but basic modes (such as 5/10/20 MHz) must be handled
with an error.

Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
parent 7ca15a0a

net/mac80211/ibss.c

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,14 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 


	chandef = ifibss->chandef;

	if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {

		if (chandef.width == NL80211_CHAN_WIDTH_5 ||

		    chandef.width == NL80211_CHAN_WIDTH_10 ||

		    chandef.width == NL80211_CHAN_WIDTH_20_NOHT ||

		    chandef.width == NL80211_CHAN_WIDTH_20) {

			sdata_info(sdata,

				   "Failed to join IBSS, beacons forbidden\n");

			return;

		}

		chandef.width = NL80211_CHAN_WIDTH_20;

		chandef.center_freq1 = chan->center_freq;

	}