aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2012-06-29 06:46:57 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-29 07:39:15 -0400
commitac800140c20e7ae51117e71289065bedd4930fc2 (patch)
tree7e9e762ed2a6a7b698db6c3cf4238dfa294364c3
parent60771780c27cbc93d0b78da0c7fd7a8a540b029e (diff)
cfg80211: .stop_ap when interface is going down
We'll need this for proper channel tracking (which is going to be needed for channel context accounting and finding matching/active interface combination). Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/core.c3
-rw-r--r--net/wireless/util.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index ddd32afa5f0..c65f59c952c 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -810,6 +810,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
810 case NL80211_IFTYPE_MESH_POINT: 810 case NL80211_IFTYPE_MESH_POINT:
811 cfg80211_leave_mesh(rdev, dev); 811 cfg80211_leave_mesh(rdev, dev);
812 break; 812 break;
813 case NL80211_IFTYPE_AP:
814 cfg80211_stop_ap(rdev, dev);
815 break;
813 default: 816 default:
814 break; 817 break;
815 } 818 }
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 316cfd00914..fc948d0a53f 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -814,6 +814,9 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
814 dev->ieee80211_ptr->mesh_id_up_len = 0; 814 dev->ieee80211_ptr->mesh_id_up_len = 0;
815 815
816 switch (otype) { 816 switch (otype) {
817 case NL80211_IFTYPE_AP:
818 cfg80211_stop_ap(rdev, dev);
819 break;
817 case NL80211_IFTYPE_ADHOC: 820 case NL80211_IFTYPE_ADHOC:
818 cfg80211_leave_ibss(rdev, dev, false); 821 cfg80211_leave_ibss(rdev, dev, false);
819 break; 822 break;