Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e3d5fa4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2016-12-22' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d995694 22b68b93

drivers/net/wireless/ath/ath10k/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/net/wireless/ath/ath9k/xmit.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+5 −2
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/realtek/rtlwifi/core.c

+2 −1
Original line number Diff line number Diff line
@@ -1829,6 +1829,7 @@ 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);

	if (pskb)

		dev_kfree_skb_irq(pskb);



	/*this is wrong, fill_tx_cmddesc needs update*/