summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2012-06-08 10:55:44 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-06-09 10:31:56 +0200
commitf8cdddb8d61d16a156229f0910f7ecfc7a82c003 (patch)
treec2f7f315196faca26ed95ec1e8e09619af4b964f /net
parentd13e14148154e5ce58467e76321eef1dd912c416 (diff)
downloadblackbird-op-linux-f8cdddb8d61d16a156229f0910f7ecfc7a82c003.tar.gz
blackbird-op-linux-f8cdddb8d61d16a156229f0910f7ecfc7a82c003.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 8f2d68fc3a44..316cfd00914f 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -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)
OpenPOWER on IntegriCloud