Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	net/wireless/nl80211.c

1 files changed, 6 insertions, 0 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index f277246080b5..4f9f216665e9 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -933,6 +933,12 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
                  * freed.
                  */
                 cfg80211_process_wdev_events(wdev);
+
+                if (WARN_ON(wdev->current_bss)) {
+                        cfg80211_unhold_bss(wdev->current_bss);
+                        cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub);
+                        wdev->current_bss = NULL;
+                }
                 break;
         case NETDEV_PRE_UP:
                 if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)))