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

Commit 1df86b4c authored by David S. Miller's avatar David S. Miller
Browse files

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



John W. Linville says:

====================
This is another batch of fixes intended for the 3.11 stream.  FWIW,
this is the first request with fixes from the mac80211 and iwlwifi
trees as well.

Regarding the mac80211 bits, Johannes says:

"Here I have a fix for RSSI thresholds in mesh, two minstrel fixes from
Felix, an nl80211 fix from Michal and four various fixes I did myself."

As for the iwlwifi bits, Johannes says:

"Here I have a fix for debugfs directory creation (causing a spurious
error message), two scanning fixes from David Spinadel, an LED fix and
two patches related to a BA session problem that eventually caused
firmware crashes from Emmanuel and a small BT fix for older devices as
well as a workaround for a firmware problem with APs with very small
beacon intervals from myself."

Along with those:

Arend van Spriel addresses a lock-up and a NULL pointer dereference
in brcmfmac.

Daniel Drake fixes an unhandled interrupt during device tear down
in mwifiex.

Larry Finger corrects a wil6210 build error.

Oleksij Rempel fixes two ath9k_htc problems related to keeping the
driver and firmware in sync.

Solomon Peachy gives us a cw1200 fix to avoid an oops in monitor mode.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents deceb4c0 18e1ccb6

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

+3 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,9 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface) 


	usb_set_intfdata(interface, NULL);



	if (!unplugged && (hif_dev->flags & HIF_USB_START))

	/* If firmware was loaded we should drop it

	 * go back to first stage bootloader. */

	if (!unplugged && (hif_dev->flags & HIF_USB_READY))

		ath9k_hif_usb_reboot(udev);



	kfree(hif_dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -861,6 +861,7 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv, 
	if (error != 0)

		goto err_rx;



	ath9k_hw_disable(priv->ah);

#ifdef CONFIG_MAC80211_LEDS

	/* must be initialized before ieee80211_register_hw */

	priv->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(priv->hw,

drivers/net/wireless/ath/wil6210/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void wil_print_ring(struct seq_file *s, const char *prefix, 
				   le16_to_cpu(hdr.type), hdr.flags);

			if (len <= MAX_MBOXITEM_SIZE) {

				int n = 0;

				unsigned char printbuf[16 * 3 + 2];

				char printbuf[16 * 3 + 2];

				unsigned char databuf[MAX_MBOXITEM_SIZE];

				void __iomem *src = wmi_buffer(wil, d.addr) +

					sizeof(struct wil6210_mbox_hdr);
@@ -416,7 +416,7 @@ static int wil_txdesc_debugfs_show(struct seq_file *s, void *data) 
		seq_printf(s, "  SKB = %p\n", skb);



		if (skb) {

			unsigned char printbuf[16 * 3 + 2];

			char printbuf[16 * 3 + 2];

			int i = 0;

			int len = le16_to_cpu(d->dma.length);

			void *p = skb->data;

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ void brcmf_txflowblock_if(struct brcmf_if *ifp, 
{

	unsigned long flags;



	if (!ifp)

	if (!ifp || !ifp->ndev)

		return;



	brcmf_dbg(TRACE, "enter: idx=%d stop=0x%X reason=%d state=%d\n",

drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c

+7 −1
Original line number Diff line number Diff line
@@ -1744,13 +1744,14 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) 
	ulong flags;

	int fifo = BRCMF_FWS_FIFO_BCMC;

	bool multicast = is_multicast_ether_addr(eh->h_dest);

	bool pae = eh->h_proto == htons(ETH_P_PAE);



	/* determine the priority */

	if (!skb->priority)

		skb->priority = cfg80211_classify8021d(skb);



	drvr->tx_multicast += !!multicast;

	if (ntohs(eh->h_proto) == ETH_P_PAE)

	if (pae)

		atomic_inc(&ifp->pend_8021x_cnt);



	if (!brcmf_fws_fc_active(fws)) {
@@ -1781,6 +1782,11 @@ int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb) 
		brcmf_fws_schedule_deq(fws);

	} else {

		brcmf_err("drop skb: no hanger slot\n");

		if (pae) {

			atomic_dec(&ifp->pend_8021x_cnt);

			if (waitqueue_active(&ifp->pend_8021x_wait))

				wake_up(&ifp->pend_8021x_wait);

		}

		brcmu_pkt_buf_free_skb(skb);

	}

	brcmf_fws_unlock(drvr, flags);