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

Commit 518eefe1 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 c6b6eedc d8343f12

drivers/bluetooth/ath3k.c

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static struct usb_device_id ath3k_table[] = { 


	/* Atheros AR5BBU22 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE03C) },

	{ USB_DEVICE(0x0489, 0xE036) },



	{ }	/* Terminating entry */

};
@@ -109,6 +110,7 @@ static struct usb_device_id ath3k_blist_tbl[] = { 


	/* Atheros AR5BBU22 with sflash firmware */

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

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



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+7 −5
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Generic Bluetooth USB device */

	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },



	/* Apple-specific (Broadcom) devices */

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



	/* Broadcom SoftSailing reporting vendor specific */

	{ USB_DEVICE(0x0a5c, 0x21e1) },
@@ -94,16 +97,14 @@ static struct usb_device_id btusb_table[] = { 


	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x0a5c, 0x21e3) },

	{ USB_DEVICE(0x0a5c, 0x21e6) },

	{ USB_DEVICE(0x0a5c, 0x21e8) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x0a5c, 0x21f4) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */

	{ USB_DEVICE(0x0489, 0xe033) },



	/*Broadcom devices with vendor specific id */

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



	{ }	/* Terminating entry */

};
@@ -141,6 +142,7 @@ static struct usb_device_id blacklist_table[] = { 


	/* Atheros AR5BBU12 with sflash firmware */

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

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



	/* Broadcom BCM2035 */

	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },

include/net/bluetooth/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct smp_chan { 
};



/* SMP Commands */

int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level);

int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);

int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);

int smp_distribute_keys(struct l2cap_conn *conn, __u8 force);

int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey);

net/bluetooth/hci_conn.c

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/a2mp.h>

#include <net/bluetooth/smp.h>



static void hci_le_connect(struct hci_conn *conn)

{
@@ -619,6 +620,9 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
{

	BT_DBG("hcon %p", conn);



	if (conn->type == LE_LINK)

		return smp_conn_security(conn, sec_level);



	/* For sdp we don't need the link key. */

	if (sec_level == BT_SECURITY_SDP)

		return 1;

net/bluetooth/l2cap_core.c

+6 −5
Original line number Diff line number Diff line
@@ -1199,14 +1199,15 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) 
static void l2cap_conn_ready(struct l2cap_conn *conn)

{

	struct l2cap_chan *chan;

	struct hci_conn *hcon = conn->hcon;



	BT_DBG("conn %p", conn);



	if (!conn->hcon->out && conn->hcon->type == LE_LINK)

	if (!hcon->out && hcon->type == LE_LINK)

		l2cap_le_conn_ready(conn);



	if (conn->hcon->out && conn->hcon->type == LE_LINK)

		smp_conn_security(conn, conn->hcon->pending_sec_level);

	if (hcon->out && hcon->type == LE_LINK)

		smp_conn_security(hcon, hcon->pending_sec_level);



	mutex_lock(&conn->chan_lock);
@@ -1219,8 +1220,8 @@ static void l2cap_conn_ready(struct l2cap_conn *conn) 
			continue;

		}



		if (conn->hcon->type == LE_LINK) {

			if (smp_conn_security(conn, chan->sec_level))

		if (hcon->type == LE_LINK) {

			if (smp_conn_security(hcon, chan->sec_level))

				l2cap_chan_ready(chan);



		} else if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {