Merge tag 'wireless-drivers-for-davem-2016-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 4.10

All small fixes this time, especially important are the regression
fixes for rtlwifi and ath9k.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index c893314a191f..50d6ee6afe26 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -8271,7 +8271,7 @@ void ath10k_wmi_free_host_mem(struct ath10k *ar)
                 dma_unmap_single(ar->dev,
                                  ar->wmi.mem_chunks[i].paddr,
                                  ar->wmi.mem_chunks[i].len,
-                                 DMA_TO_DEVICE);
+                                 DMA_BIDIRECTIONAL);
                 kfree(ar->wmi.mem_chunks[i].vaddr);
         }
 
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 486afa98a5b8..4e2f3ac266c3 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -2713,7 +2713,7 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
                 fifo_list = &txq->txq_fifo[txq->txq_tailidx];
                 if (list_empty(fifo_list)) {
                         ath_txq_unlock(sc, txq);
-                        return;
+                        break;
                 }
 
                 bf = list_first_entry(fifo_list, struct ath_buf, list);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index ccae3bbe7db2..7ffc4aba5bab 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6868,7 +6868,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 
         err = brcmf_p2p_attach(cfg, p2pdev_forced);
         if (err) {
-                brcmf_err("P2P initilisation failed (%d)\n", err);
+                brcmf_err("P2P initialisation failed (%d)\n", err);
                 goto wiphy_unreg_out;
         }
         err = brcmf_btcoex_attach(cfg);
@@ -6893,7 +6893,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
         err = brcmf_fweh_activate_events(ifp);
         if (err) {
                 brcmf_err("FWEH activation failed (%d)\n", err);
-                goto wiphy_unreg_out;
+                goto detach;
         }
 
         /* Fill in some of the advertised nl80211 supported features */
@@ -6908,6 +6908,9 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
 
         return cfg;
 
+detach:
+        brcmf_btcoex_detach(cfg);
+        brcmf_p2p_detach(&cfg->p2p);
 wiphy_unreg_out:
         wiphy_unregister(cfg->wiphy);
 priv_out:
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
index f273cab0da10..9a25e79a46cf 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
@@ -137,6 +137,7 @@ static int brcmf_pno_add_ssid(struct brcmf_if *ifp, struct cfg80211_ssid *ssid,
         pfn.wpa_auth = cpu_to_le32(BRCMF_PNO_WPA_AUTH_ANY);
         pfn.wsec = cpu_to_le32(0);
         pfn.infra = cpu_to_le32(1);
+        pfn.flags = 0;
         if (active)
                 pfn.flags = cpu_to_le32(1 << BRCMF_PNO_HIDDEN_BIT);
         pfn.ssid.SSID_len = cpu_to_le32(ssid->ssid_len);
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index 2caa4ad04dba..ded1493fee9c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -1829,7 +1829,8 @@ bool rtl_cmd_send_packet(struct ieee80211_hw *hw, struct sk_buff *skb)
 
         spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         pskb = __skb_dequeue(&ring->queue);
-        dev_kfree_skb_irq(pskb);
+        if (pskb)
+                dev_kfree_skb_irq(pskb);
 
         /*this is wrong, fill_tx_cmddesc needs update*/
         pdesc = &ring->desc[0];