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

Commit e563589f authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
parents 197bbf0a 76a388be

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x0489, 0xe04e) },

	{ USB_DEVICE(0x0489, 0xe056) },

	{ USB_DEVICE(0x0489, 0xe04d) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -126,6 +127,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },

drivers/bluetooth/btusb.c

+25 −16
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -926,6 +927,22 @@ static void btusb_waker(struct work_struct *work) 
	usb_autopm_put_interface(data->intf);

}



static int btusb_setup_bcm92035(struct hci_dev *hdev)

{

	struct sk_buff *skb;

	u8 val = 0x00;



	BT_DBG("%s", hdev->name);



	skb = __hci_cmd_sync(hdev, 0xfc3b, 1, &val, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb))

		BT_ERR("BCM92035 command failed (%ld)", -PTR_ERR(skb));

	else

		kfree_skb(skb);



	return 0;

}



static int btusb_probe(struct usb_interface *intf,

				const struct usb_device_id *id)

{
@@ -1028,6 +1045,9 @@ static int btusb_probe(struct usb_interface *intf, 
	hdev->send   = btusb_send_frame;

	hdev->notify = btusb_notify;



	if (id->driver_info & BTUSB_BCM92035)

		hdev->setup = btusb_setup_bcm92035;



	/* Interface numbers are hardcoded in the specification */

	data->isoc = usb_ifnum_to_if(data->udev, 1);
@@ -1065,17 +1085,6 @@ static int btusb_probe(struct usb_interface *intf, 
		data->isoc = NULL;

	}



	if (id->driver_info & BTUSB_BCM92035) {

		unsigned char cmd[] = { 0x3b, 0xfc, 0x01, 0x00 };

		struct sk_buff *skb;



		skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);

		if (skb) {

			memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd));

			skb_queue_tail(&hdev->driver_init, skb);

		}

	}



	if (data->isoc) {

		err = usb_driver_claim_interface(&btusb_driver,

							data->isoc, data);

drivers/bluetooth/hci_h4.c

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ static int h4_recv(struct hci_uart *hu, void *data, int count) 
{

	int ret;



	if (!test_bit(HCI_UART_REGISTERED, &hu->flags))

		return -EUNATCH;



	ret = hci_recv_stream_fragment(hu->hdev, data, count);

	if (ret < 0) {

		BT_ERR("Frame Reassembly Failed");

drivers/bluetooth/hci_ldisc.c

+9 −6
Original line number Diff line number Diff line
@@ -388,7 +388,10 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *f 


	spin_lock(&hu->rx_lock);

	hu->proto->recv(hu, (void *) data, count);



	if (hu->hdev)

		hu->hdev->stat.byte_rx += count;



	spin_unlock(&hu->rx_lock);



	tty_unthrottle(tty);

include/net/bluetooth/bluetooth.h

+3 −2
Original line number Diff line number Diff line
@@ -193,11 +193,11 @@ static inline bool bdaddr_type_is_le(__u8 type) 
#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff} })



/* Copy, swap, convert BD Address */

static inline int bacmp(bdaddr_t *ba1, bdaddr_t *ba2)

static inline int bacmp(const bdaddr_t *ba1, const bdaddr_t *ba2)

{

	return memcmp(ba1, ba2, sizeof(bdaddr_t));

}

static inline void bacpy(bdaddr_t *dst, bdaddr_t *src)

static inline void bacpy(bdaddr_t *dst, const bdaddr_t *src)

{

	memcpy(dst, src, sizeof(bdaddr_t));

}
@@ -266,6 +266,7 @@ typedef void (*hci_req_complete_t)(struct hci_dev *hdev, u8 status); 


struct hci_req_ctrl {

	bool			start;

	u8			event;

	hci_req_complete_t	complete;

};