---

yaml --- r: 315189 b: refs/heads/master c: ac80014 h: refs/heads/master i: 315187: 4adef94 v: v3
git-mirror · Jun 29, 2012 · eb4a979 · eb4a979
1 parent e91cb43
commit eb4a979
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60771780c27cbc93d0b78da0c7fd7a8a540b029e
+refs/heads/master: ac800140c20e7ae51117e71289065bedd4930fc2
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
@@ -810,6 +810,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
 		case NL80211_IFTYPE_MESH_POINT:
 			cfg80211_leave_mesh(rdev, dev);
 			break;
+		case NL80211_IFTYPE_AP:
+			cfg80211_stop_ap(rdev, dev);
+			break;
 		default:
 			break;
 		}

diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
@@ -814,6 +814,9 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
 		dev->ieee80211_ptr->mesh_id_up_len = 0;
 
 		switch (otype) {
+		case NL80211_IFTYPE_AP:
+			cfg80211_stop_ap(rdev, dev);
+			break;
 		case NL80211_IFTYPE_ADHOC:
 			cfg80211_leave_ibss(rdev, dev, false);
 			break;