diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-28 17:18:21 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-28 17:18:21 (GMT) |
| commit | 57ed5cd695d7373b8ae0ae9f10fe945e774d58f0 (patch) | |
| tree | 7ee6244ea7c0be81a541d4e57783f83c4dfd7d66 /net/wireless/core.c | |
| parent | 5e6700b3bf98fe98d630bf9c939ad4c85ce95592 (diff) | |
| parent | 0f817ed52d07873cd39c9d3f6d87fae962dc742f (diff) | |
| download | linux-57ed5cd695d7373b8ae0ae9f10fe945e774d58f0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/wireless/nl80211.c
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index f277246..4f9f216 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))) |