summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-28 13:45:58 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-06-28 13:45:58 +0200
commitb1fbd46976d047a6d6767872a9112afaa914fd82 (patch)
tree59b471d8b38ca2a271fcde02f8f049e390ef485b /net/wireless
parentbf0c111ec80355ee9fe2e2bdb609a536b54768d8 (diff)
parentbf52592fe4901f486a5266fd73e4ee80205b18b4 (diff)
downloadlinux-b1fbd46976d047a6d6767872a9112afaa914fd82.tar.bz2
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c2
-rw-r--r--net/wireless/util.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 15f347477a99..baf5704740ee 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1389,7 +1389,7 @@ static void reg_set_request_processed(void)
spin_unlock(&reg_requests_lock);
if (last_request->initiator == NL80211_REGDOM_SET_BY_USER)
- cancel_delayed_work_sync(&reg_timeout);
+ cancel_delayed_work(&reg_timeout);
if (need_more_processing)
schedule_work(&reg_work);
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)