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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

parents b75ff5e8 5bcecf32

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },

	{ USB_DEVICE(0x0CF3, 0xE005) },

	{ USB_DEVICE(0x0930, 0x0219) },

	{ USB_DEVICE(0x0489, 0xe057) },

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

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

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

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

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

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

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

drivers/bluetooth/btusb.c

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[] = { 


	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0b05, 0x17b5) },

	{ USB_DEVICE(0x0b05, 0x17cb) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x413c, 0x8197) },
@@ -112,6 +113,9 @@ static struct usb_device_id btusb_table[] = { 
	/*Broadcom devices with vendor specific id */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },



	/* Belkin F8065bf - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },



	{ }	/* Terminating entry */

};
@@ -148,6 +152,7 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },

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

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

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

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },

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

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

include/net/bluetooth/hci.h

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

	HCI_SETUP,

	HCI_AUTO_OFF,

	HCI_RFKILLED,

	HCI_MGMT,

	HCI_PAIRABLE,

	HCI_SERVICE_CACHE,

net/bluetooth/hci_core.c

+20 −6
Original line number Diff line number Diff line
@@ -1146,7 +1146,11 @@ int hci_dev_open(__u16 dev) 
		goto done;

	}



	if (hdev->rfkill && rfkill_blocked(hdev->rfkill)) {

	/* Check for rfkill but allow the HCI setup stage to proceed

	 * (which in itself doesn't cause any RF activity).

	 */

	if (test_bit(HCI_RFKILLED, &hdev->dev_flags) &&

	    !test_bit(HCI_SETUP, &hdev->dev_flags)) {

		ret = -ERFKILL;

		goto done;

	}
@@ -1566,10 +1570,13 @@ static int hci_rfkill_set_block(void *data, bool blocked) 


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



	if (!blocked)

		return 0;



	if (blocked) {

		set_bit(HCI_RFKILLED, &hdev->dev_flags);

		if (!test_bit(HCI_SETUP, &hdev->dev_flags))

			hci_dev_do_close(hdev);

	} else {

		clear_bit(HCI_RFKILLED, &hdev->dev_flags);

}



	return 0;

}
@@ -1591,9 +1598,13 @@ static void hci_power_on(struct work_struct *work) 
		return;

	}



	if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags))

	if (test_bit(HCI_RFKILLED, &hdev->dev_flags)) {

		clear_bit(HCI_AUTO_OFF, &hdev->dev_flags);

		hci_dev_do_close(hdev);

	} else if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) {

		queue_delayed_work(hdev->req_workqueue, &hdev->power_off,

				   HCI_AUTO_OFF_TIMEOUT);

	}



	if (test_and_clear_bit(HCI_SETUP, &hdev->dev_flags))

		mgmt_index_added(hdev);
@@ -2209,6 +2220,9 @@ int hci_register_dev(struct hci_dev *hdev) 
		}

	}



	if (hdev->rfkill && rfkill_blocked(hdev->rfkill))

		set_bit(HCI_RFKILLED, &hdev->dev_flags);



	set_bit(HCI_SETUP, &hdev->dev_flags);



	if (hdev->dev_type != HCI_AMP)

net/bluetooth/hci_event.c

+5 −1
Original line number Diff line number Diff line
@@ -3557,7 +3557,11 @@ static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	cp.handle = cpu_to_le16(conn->handle);



	if (ltk->authenticated)

		conn->sec_level = BT_SECURITY_HIGH;

		conn->pending_sec_level = BT_SECURITY_HIGH;

	else

		conn->pending_sec_level = BT_SECURITY_MEDIUM;



	conn->enc_key_size = ltk->enc_size;



	hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);