Commit 45e826fd 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 2015-02-03

Here's what's likely the last bluetooth-next pull request for 3.20.
Notable changes include:

 - xHCI workaround + a new id for the ath3k driver
 - Several new ids for the btusb driver
 - Support for new Intel Bluetooth controllers
 - Minor cleanups to ieee802154 code
 - Nested sleep warning fix in socket accept() code path
 - Fixes for Out of Band pairing handling
 - Support for LE scan restarting for HCI_QUIRK_STRICT_DUPLICATE_FILTER
 - Improvements to data we expose through debugfs
 - Proper handling of Hardware Error HCI events

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dcdc8994 88d9077c

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x13d3, 0x3402) },

	{ USB_DEVICE(0x13d3, 0x3408) },

	{ USB_DEVICE(0x13d3, 0x3423) },

	{ USB_DEVICE(0x13d3, 0x3432) },



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

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

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

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

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



	/* Atheros AR5BBU22 with sflash firmware */
@@ -174,6 +176,8 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
#define USB_REQ_DFU_DNLOAD	1

#define BULK_SIZE		4096

#define FW_HDR_SIZE		20

#define TIMEGAP_USEC_MIN	50

#define TIMEGAP_USEC_MAX	100



static int ath3k_load_firmware(struct usb_device *udev,

				const struct firmware *firmware)
@@ -205,6 +209,9 @@ static int ath3k_load_firmware(struct usb_device *udev, 
	pipe = usb_sndbulkpipe(udev, 0x02);



	while (count) {

		/* workaround the compatibility issue with xHCI controller*/

		usleep_range(TIMEGAP_USEC_MIN, TIMEGAP_USEC_MAX);



		size = min_t(uint, count, BULK_SIZE);

		memcpy(send_buf, firmware->data + sent, size);
@@ -302,6 +309,9 @@ static int ath3k_load_fwfile(struct usb_device *udev, 
	pipe = usb_sndbulkpipe(udev, 0x02);



	while (count) {

		/* workaround the compatibility issue with xHCI controller*/

		usleep_range(TIMEGAP_USEC_MIN, TIMEGAP_USEC_MAX);



		size = min_t(uint, count, BULK_SIZE);

		memcpy(send_buf, firmware->data + sent, size);

drivers/bluetooth/btusb.c

+657 −14

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ieee802154/cc2520.c

+5 −5
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 
#define	CC2520_FREG_MASK	0x3F



/* status byte values */

#define	CC2520_STATUS_XOSC32M_STABLE	(1 << 7)

#define	CC2520_STATUS_RSSI_VALID	(1 << 6)

#define	CC2520_STATUS_TX_UNDERFLOW	(1 << 3)

#define	CC2520_STATUS_XOSC32M_STABLE	BIT(7)

#define	CC2520_STATUS_RSSI_VALID	BIT(6)

#define	CC2520_STATUS_TX_UNDERFLOW	BIT(3)



/* IEEE-802.15.4 defined constants (2.4 GHz logical channels) */

#define	CC2520_MINCHANNEL		11

include/net/bluetooth/hci_core.h

+10 −1

File changed.

Preview size limit exceeded, changes collapsed.

include/net/bluetooth/mgmt.h

+0 −4
Original line number Diff line number Diff line
@@ -301,10 +301,6 @@ struct mgmt_cp_user_passkey_neg_reply { 
#define MGMT_OP_READ_LOCAL_OOB_DATA	0x0020

#define MGMT_READ_LOCAL_OOB_DATA_SIZE	0

struct mgmt_rp_read_local_oob_data {

	__u8	hash[16];

	__u8	rand[16];

} __packed;

struct mgmt_rp_read_local_oob_ext_data {

	__u8	hash192[16];

	__u8	rand192[16];

	__u8	hash256[16];

CRA Git | Maintained and supported by SUSTech CRA and CCSE