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

Commit eb608d2b 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:

====================
pull request: wireless 2014-06-27

Please pull the following batch of fixes for the 3.16 stream...

For the mac80211 bits, Johannes says:

"We have a fix from Eliad for a time calculation, a fix from Max for
head/tailroom when sending authentication packets, a revert that Felix
requested since the patch in question broke regulatory and a fix from
myself for an issue with a new command that we advertised in the wrong
place."

For the bluetooth bits, Gustavo says:

"A few fixes for 3.16. This pull request contains a NULL dereference fix,
and some security/pairing fixes."

For the iwlwifi bits, Emmanuel says:

"I have here a fix from Eliad for scheduled scan: it fixes a firmware
assertion. Arik reverts a patch I made that didn't take into account
that 3160 doesn't have UAPSD and hence, we can't assume that all
newer firmwares support the feature. Here too, the visible effect
is a firmware assertion. Along with that, we have a few fixes and
additions to the device list."

For the ath10k bits, Kalle says:

"Bartosz fixed an issue where we were not able to create 8 vdevs when
using DFS. Michal removed a false warning which was just confusing
people."

On top of that...

Arend van Spriel fixes a 'divide by zero' regression in brcmfmac.

Amitkumar Karwar corrects a transmit timeout in mwifiex.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b758858c f9fa39e9

drivers/bluetooth/ath3k.c

+0 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0b05, 0x17d0) },

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3005) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x311E) },
@@ -140,7 +139,6 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/hci_h5.c

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ static int h5_rx_3wire_hdr(struct hci_uart *hu, unsigned char c) 
	    H5_HDR_PKT_TYPE(hdr) != HCI_3WIRE_LINK_PKT) {

		BT_ERR("Non-link packet received in non-active state");

		h5_reset_rx(h5);

		return 0;

	}



	h5->rx_func = h5_rx_payload;

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

+5 −1
Original line number Diff line number Diff line
@@ -795,7 +795,11 @@ int ath10k_core_start(struct ath10k *ar) 
	if (status)

		goto err_htc_stop;



	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))

		ar->free_vdev_map = (1 << TARGET_10X_NUM_VDEVS) - 1;

	else

		ar->free_vdev_map = (1 << TARGET_NUM_VDEVS) - 1;



	INIT_LIST_HEAD(&ar->arvifs);



	if (!test_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags))

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

+0 −18
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, 
	int msdu_len, msdu_chaining = 0;

	struct sk_buff *msdu;

	struct htt_rx_desc *rx_desc;

	bool corrupted = false;



	lockdep_assert_held(&htt->rx_ring.lock);
@@ -439,9 +438,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, 
		last_msdu = __le32_to_cpu(rx_desc->msdu_end.info0) &

				RX_MSDU_END_INFO0_LAST_MSDU;



		if (msdu_chaining && !last_msdu)

			corrupted = true;



		if (last_msdu) {

			msdu->next = NULL;

			break;
@@ -456,20 +452,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, 
	if (*head_msdu == NULL)

		msdu_chaining = -1;



	/*

	 * Apparently FW sometimes reports weird chained MSDU sequences with

	 * more than one rx descriptor. This seems like a bug but needs more

	 * analyzing. For the time being fix it by dropping such sequences to

	 * avoid blowing up the host system.

	 */

	if (corrupted) {

		ath10k_warn("failed to pop chained msdus, dropping\n");

		ath10k_htt_rx_free_msdu_chain(*head_msdu);

		*head_msdu = NULL;

		*tail_msdu = NULL;

		msdu_chaining = -EINVAL;

	}



	/*

	 * Don't refill the ring yet.

	 *