Merge remote-tracking branch 'agust/next' into next

[deliverable/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / wl_cfg80211.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 5598a20891d2f85de51842d4904e07ecba63f474..d7718a5fa2f0323c46458300f417b7dbd6e46b8e 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2989,6 +2989,7 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
                }
 
                set_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
+               cfg->escan_info.run = brcmf_run_escan;
                err = brcmf_do_escan(cfg, wiphy, ifp, request);
                if (err) {
                        clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
@@ -4385,6 +4386,18 @@ void brcmf_free_vif(struct brcmf_cfg80211_vif *vif)
        kfree(vif);
 }
 
+void brcmf_cfg80211_free_netdev(struct net_device *ndev)
+{
+       struct brcmf_cfg80211_vif *vif;
+       struct brcmf_if *ifp;
+
+       ifp = netdev_priv(ndev);
+       vif = ifp->vif;
+
+       brcmf_free_vif(vif);
+       free_netdev(ndev);
+}
+
 static bool brcmf_is_linkup(const struct brcmf_event_msg *e)
 {
        u32 event = e->event_code;
@@ -4975,6 +4988,9 @@ cfg80211_attach_out:
 
 void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
 {
+       if (!cfg)
+               return;
+
        WARN_ON(!list_empty(&cfg->vif_list));
        wiphy_unregister(cfg->wiphy);
        brcmf_btcoex_detach(cfg);