Commit dcebf45c authored Dec 22, 2008 by Pavel Roskin Committed by John W. Linville Jan 12, 2009

mac80211: allow mode change if IBSS is not allowed

Changing mode on an interface is not allowed if IBSS is disabled for the
current channel. That restriction should only apply when switching to
the ad-hoc mode, as it was prior to "cfg80211: handle SIOCGIWMODE/SIOCSIWMODE".

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 4fb7404e

net/mac80211/iface.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -699,7 +699,8 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
		return 0;

		/* Setting ad-hoc mode on non-IBSS channel is not supported. */
		if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS)
		if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS &&
		type == NL80211_IFTYPE_ADHOC)
		return -EOPNOTSUPP;

		/*