diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-09 21:06:28 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-09 21:06:28 +0200 |
commit | 4f0544489215fc78cccb96f8e3d0f078ae965297 (patch) | |
tree | 69e71db0cf005a68ab1b70f33ae0462fd94152fc /net/wireless/core.c | |
parent | ath9k: Add more PCI IDs for WB225 cards (diff) | |
parent | cw1200: Fix spurious BUG_ON() trigger when starting AP mode. (diff) | |
download | linux-4f0544489215fc78cccb96f8e3d0f078ae965297.tar.xz linux-4f0544489215fc78cccb96f8e3d0f078ae965297.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 389a3f2ee464..67153964aad2 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -774,6 +774,7 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev, cfg80211_leave_mesh(rdev, dev); break; case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_P2P_GO: cfg80211_stop_ap(rdev, dev); break; default: |