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

Commit 180a2c54 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2016-03-12

Here's the last bluetooth-next pull request for the 4.6 kernel.

 - New USB ID for AR3012 in btusb
 - New BCM2E55 ACPI ID
 - Buffer overflow fix for the Add Advertising command
 - Support for a new Bluetooth LE limited privacy mode
 - Fix for firmware activation in btmrvl_sdio
 - Cleanups to mac802154 & 6lowpan code

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f7f58ae0 6a0e7807

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x13d3, 0x3423) },

	{ USB_DEVICE(0x13d3, 0x3432) },

	{ USB_DEVICE(0x13d3, 0x3472) },

	{ USB_DEVICE(0x13d3, 0x3474) },



	/* Atheros AR5BBU12 with sflash firmware */
@@ -185,6 +186,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

drivers/bluetooth/btmrvl_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int btmrvl_sdio_verify_fw_download(struct btmrvl_sdio_card *card, 
		if (firmwarestat == FIRMWARE_READY)

			return 0;



		msleep(10);

		msleep(100);

	}



	return -ETIMEDOUT;

drivers/bluetooth/btusb.c

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

	{ USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

drivers/bluetooth/hci_bcm.c

+1 −0
Original line number Diff line number Diff line
@@ -821,6 +821,7 @@ static const struct acpi_device_id bcm_acpi_match[] = { 
	{ "BCM2E3F", 0 },

	{ "BCM2E40", 0 },

	{ "BCM2E54", 0 },

	{ "BCM2E55", 0 },

	{ "BCM2E64", 0 },

	{ "BCM2E65", 0 },

	{ "BCM2E67", 0 },

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ enum { 
	HCI_SC_ENABLED,

	HCI_SC_ONLY,

	HCI_PRIVACY,

	HCI_LIMITED_PRIVACY,

	HCI_RPA_EXPIRED,

	HCI_RPA_RESOLVING,

	HCI_HS_ENABLED,