Commit f8cdddb8 authored Jun 08, 2012 by Michal Kazior Committed by Johannes Berg Jun 09, 2012

cfg80211: check iface combinations only when iface is running



Don't validate interface combinations on a stopped
interface. Otherwise we might end up being able to
create a new interface with a certain type, but
won't be able to change an existing interface
into that type.

This also skips some other functions when
interface is stopped and changing interface type.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent d13e1414

net/wireless/util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
		ntype == NL80211_IFTYPE_P2P_CLIENT))
		return -EBUSY;

		if (ntype != otype) {
		if (ntype != otype && netif_running(dev)) {
		err = cfg80211_can_change_interface(rdev, dev->ieee80211_ptr,
		ntype);
		if (err)