From eb4a9794e7ae9cf50e3072258e46acc2f529b338 Mon Sep 17 00:00:00 2001
From: Michal Kazior <michal.kazior@tieto.com>
Date: Fri, 29 Jun 2012 12:46:57 +0200
Subject: [PATCH] --- yaml --- r: 315189 b: refs/heads/master c:
 ac800140c20e7ae51117e71289065bedd4930fc2 h: refs/heads/master i:   315187:
 4adef9450dee0a325a27c0867ceb3e16b02a1e44 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/core.c | 3 +++
 trunk/net/wireless/util.c | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 078e5d55f890..f72f6f779b04 100644
--- 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
index ddd32afa5f0a..c65f59c952c9 100644
--- 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
index 316cfd00914f..fc948d0a53f3 100644
--- 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;