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

Commit 15cb3096 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/padovan/bluetooth-next-2.6

parents 4daf50f2 55183d06

drivers/bluetooth/ath3k.c

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


	/* Atheros AR3011 with sflash firmware*/

	{ USB_DEVICE(0x0CF3, 0x3002) },

	{ USB_DEVICE(0x13d3, 0x3304) },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03F0, 0x311D) },

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static struct usb_device_id blacklist_table[] = { 


	/* Atheros 3011 with sflash firmware */

	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },

	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },



	/* Atheros AR9285 Malbec with sflash firmware */

	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ void hci_conn_check_pending(struct hci_dev *hdev); 


struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 sec_level, __u8 auth_type);

int hci_conn_check_link_mode(struct hci_conn *conn);

int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);

int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);

int hci_conn_change_link_key(struct hci_conn *conn);

int hci_conn_switch_role(struct hci_conn *conn, __u8 role);

include/net/bluetooth/l2cap.h

+6 −3
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ struct l2cap_chan { 
	struct list_head	srej_l;



	struct list_head list;

	struct list_head global_l;

};



struct l2cap_conn {
@@ -441,7 +442,6 @@ static inline int l2cap_tx_window_full(struct l2cap_chan *ch) 
#define __is_sar_start(ctrl)	(((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START)



extern int disable_ertm;

extern struct bt_sock_list l2cap_sk_list;



int l2cap_init_sockets(void);

void l2cap_cleanup_sockets(void);
@@ -458,6 +458,9 @@ void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb); 
void l2cap_streaming_send(struct l2cap_chan *chan);

int l2cap_ertm_send(struct l2cap_chan *chan);



int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);

int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);



void l2cap_sock_set_timer(struct sock *sk, long timeout);

void l2cap_sock_clear_timer(struct sock *sk);

void __l2cap_sock_close(struct sock *sk, int reason);
@@ -466,9 +469,9 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent); 
struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,

							int proto, gfp_t prio);

void l2cap_send_disconn_req(struct l2cap_conn *conn, struct l2cap_chan *chan, int err);

struct l2cap_chan *l2cap_chan_alloc(struct sock *sk);

struct l2cap_chan *l2cap_chan_create(struct sock *sk);

void l2cap_chan_del(struct l2cap_chan *chan, int err);

void l2cap_chan_free(struct l2cap_chan *chan);

void l2cap_chan_destroy(struct l2cap_chan *chan);

int l2cap_chan_connect(struct l2cap_chan *chan);



#endif /* __L2CAP_H */

net/bluetooth/hci_conn.c

+17 −0
Original line number Diff line number Diff line
@@ -623,6 +623,23 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
}

EXPORT_SYMBOL(hci_conn_security);



/* Check secure link requirement */

int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level)

{

	BT_DBG("conn %p", conn);



	if (sec_level != BT_SECURITY_HIGH)

		return 1; /* Accept if non-secure is required */



	if (conn->key_type == HCI_LK_AUTH_COMBINATION ||

			(conn->key_type == HCI_LK_COMBINATION &&

			conn->pin_length == 16))

		return 1;



	return 0; /* Reject not secure link */

}

EXPORT_SYMBOL(hci_conn_check_secure);



/* Change link key */

int hci_conn_change_link_key(struct hci_conn *conn)

{