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

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

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

parents ffa216bb 1fb4e09a

drivers/bluetooth/ath3k.c

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

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x04CA, 0x3006) },

	{ USB_DEVICE(0x04CA, 0x3007) },

	{ USB_DEVICE(0x04CA, 0x3008) },

	{ USB_DEVICE(0x04CA, 0x300b) },

	{ USB_DEVICE(0x0930, 0x0219) },
@@ -131,6 +132,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

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

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

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

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

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

drivers/bluetooth/btusb.c

+2 −3
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },

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

	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 },

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

	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
@@ -1485,10 +1486,8 @@ static int btusb_probe(struct usb_interface *intf, 
	if (id->driver_info & BTUSB_BCM92035)

		hdev->setup = btusb_setup_bcm92035;



	if (id->driver_info & BTUSB_INTEL) {

		usb_enable_autosuspend(data->udev);

	if (id->driver_info & BTUSB_INTEL)

		hdev->setup = btusb_setup_intel;

	}



	/* Interface numbers are hardcoded in the specification */

	data->isoc = usb_ifnum_to_if(data->udev, 1);

net/bluetooth/hci_conn.c

+6 −3
Original line number Diff line number Diff line
@@ -819,14 +819,17 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
	if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->flags)) {

		struct hci_cp_auth_requested cp;



		/* encrypt must be pending if auth is also pending */

		set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);



		cp.handle = cpu_to_le16(conn->handle);

		hci_send_cmd(conn->hdev, HCI_OP_AUTH_REQUESTED,

			     sizeof(cp), &cp);



		/* If we're already encrypted set the REAUTH_PEND flag,

		 * otherwise set the ENCRYPT_PEND.

		 */

		if (conn->key_type != 0xff)

			set_bit(HCI_CONN_REAUTH_PEND, &conn->flags);

		else

			set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);

	}



	return 0;

net/bluetooth/hci_event.c

+6 −0
Original line number Diff line number Diff line
@@ -3330,6 +3330,12 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev, 
	if (!conn)

		goto unlock;



	/* For BR/EDR the necessary steps are taken through the

	 * auth_complete event.

	 */

	if (conn->type != LE_LINK)

		goto unlock;



	if (!ev->status)

		conn->sec_level = conn->pending_sec_level;