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

Commit f3b3e36f 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 b0006e69 db940cb0

drivers/bluetooth/btusb.c

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Apple MacBookAir3,1, MacBookAir3,2 */

	{ USB_DEVICE(0x05ac, 0x821b) },



	/* Apple MacBookPro8,2 */

	{ USB_DEVICE(0x05ac, 0x821a) },



	/* AVM BlueFRITZ! USB v2.0 */

	{ USB_DEVICE(0x057c, 0x3800) },
@@ -690,7 +693,8 @@ static int btusb_send_frame(struct sk_buff *skb) 
		break;



	case HCI_ACLDATA_PKT:

		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1)

		if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 &&

						hdev->conn_hash.le_num < 1))

			return -ENODEV;



		urb = usb_alloc_urb(0, GFP_ATOMIC);

include/net/bluetooth/hci.h

+39 −3
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ enum { 
	HCI_SERVICE_CACHE,

	HCI_LINK_KEYS,

	HCI_DEBUG_KEYS,



	HCI_RESET,

};



/* HCI ioctl defines */
@@ -426,6 +428,18 @@ struct hci_rp_user_confirm_reply { 


#define HCI_OP_USER_CONFIRM_NEG_REPLY	0x042d



#define HCI_OP_REMOTE_OOB_DATA_REPLY	0x0430

struct hci_cp_remote_oob_data_reply {

	bdaddr_t bdaddr;

	__u8     hash[16];

	__u8     randomizer[16];

} __packed;



#define HCI_OP_REMOTE_OOB_DATA_NEG_REPLY	0x0433

struct hci_cp_remote_oob_data_neg_reply {

	bdaddr_t bdaddr;

} __packed;



#define HCI_OP_IO_CAPABILITY_NEG_REPLY	0x0434

struct hci_cp_io_capability_neg_reply {

	bdaddr_t bdaddr;
@@ -535,15 +549,17 @@ struct hci_cp_delete_stored_link_key { 
	__u8     delete_all;

} __packed;



#define HCI_MAX_NAME_LENGTH		248



#define HCI_OP_WRITE_LOCAL_NAME		0x0c13

struct hci_cp_write_local_name {

	__u8     name[248];

	__u8     name[HCI_MAX_NAME_LENGTH];

} __packed;



#define HCI_OP_READ_LOCAL_NAME		0x0c14

struct hci_rp_read_local_name {

	__u8     status;

	__u8     name[248];

	__u8     name[HCI_MAX_NAME_LENGTH];

} __packed;



#define HCI_OP_WRITE_CA_TIMEOUT		0x0c16
@@ -600,6 +616,14 @@ struct hci_cp_host_buffer_size { 


#define HCI_OP_WRITE_INQUIRY_MODE	0x0c45



#define HCI_MAX_EIR_LENGTH		240



#define HCI_OP_WRITE_EIR		0x0c52

struct hci_cp_write_eir {

	uint8_t		fec;

	uint8_t		data[HCI_MAX_EIR_LENGTH];

} __packed;



#define HCI_OP_READ_SSP_MODE		0x0c55

struct hci_rp_read_ssp_mode {

	__u8     status;
@@ -611,6 +635,13 @@ struct hci_cp_write_ssp_mode { 
	__u8     mode;

} __packed;



#define HCI_OP_READ_LOCAL_OOB_DATA		0x0c57

struct hci_rp_read_local_oob_data {

	__u8     status;

	__u8     hash[16];

	__u8     randomizer[16];

} __packed;



#define HCI_OP_READ_INQ_RSP_TX_POWER	0x0c58



#define HCI_OP_READ_LOCAL_VERSION	0x1001
@@ -745,7 +776,7 @@ struct hci_ev_auth_complete { 
struct hci_ev_remote_name {

	__u8     status;

	bdaddr_t bdaddr;

	__u8     name[248];

	__u8     name[HCI_MAX_NAME_LENGTH];

} __packed;



#define HCI_EV_ENCRYPT_CHANGE		0x08
@@ -953,6 +984,11 @@ struct hci_ev_user_confirm_req { 
	__le32		passkey;

} __packed;



#define HCI_EV_REMOTE_OOB_DATA_REQUEST	0x35

struct hci_ev_remote_oob_data_request {

	bdaddr_t bdaddr;

} __packed;



#define HCI_EV_SIMPLE_PAIR_COMPLETE	0x36

struct hci_ev_simple_pair_complete {

	__u8     status;

include/net/bluetooth/hci_core.h

+24 −1
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ struct link_key { 
	u8 pin_len;

};



struct oob_data {

	struct list_head list;

	bdaddr_t bdaddr;

	u8 hash[16];

	u8 randomizer[16];

};



#define NUM_REASSEMBLY 4

struct hci_dev {

	struct list_head list;
@@ -94,7 +101,8 @@ struct hci_dev { 
	__u8		bus;

	__u8		dev_type;

	bdaddr_t	bdaddr;

	__u8		dev_name[248];

	__u8		dev_name[HCI_MAX_NAME_LENGTH];

	__u8		eir[HCI_MAX_EIR_LENGTH];

	__u8		dev_class[3];

	__u8		major_class;

	__u8		minor_class;
@@ -169,6 +177,8 @@ struct hci_dev { 


	struct list_head	link_keys;



	struct list_head	remote_oob_data;



	struct hci_dev_stats	stat;



	struct sk_buff_head	driver_init;
@@ -505,6 +515,13 @@ int hci_add_link_key(struct hci_dev *hdev, int new_key, bdaddr_t *bdaddr, 
						u8 *key, u8 type, u8 pin_len);

int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);



int hci_remote_oob_data_clear(struct hci_dev *hdev);

struct oob_data *hci_find_remote_oob_data(struct hci_dev *hdev,

							bdaddr_t *bdaddr);

int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash,

								u8 *randomizer);

int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);



void hci_del_off_timer(struct hci_dev *hdev);



void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
@@ -767,6 +784,12 @@ int mgmt_user_confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status); 
int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr,

								u8 status);

int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status);

int mgmt_set_local_name_complete(u16 index, u8 *name, u8 status);

int mgmt_read_local_oob_data_reply_complete(u16 index, u8 *hash, u8 *randomizer,

								u8 status);

int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi,

								u8 *eir);

int mgmt_remote_name(u16 index, bdaddr_t *bdaddr, u8 *name);



/* HCI info for socket */

#define hci_pi(sk) ((struct hci_pinfo *) sk)

include/net/bluetooth/l2cap.h

+0 −2
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ struct l2cap_conn_param_update_rsp { 
struct l2cap_chan_list {

	struct sock	*head;

	rwlock_t	lock;

	long		num;

};



struct l2cap_conn {
@@ -302,7 +301,6 @@ struct l2cap_conn { 


	struct sk_buff *rx_skb;

	__u32		rx_len;

	__u8		rx_ident;

	__u8		tx_ident;



	__u8		disc_reason;

include/net/bluetooth/mgmt.h

+47 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ struct mgmt_rp_read_index_list { 
	__le16 index[0];

} __packed;



/* Reserve one extra byte for names in management messages so that they

 * are always guaranteed to be nul-terminated */

#define MGMT_MAX_NAME_LENGTH		(HCI_MAX_NAME_LENGTH + 1)



#define MGMT_OP_READ_INFO		0x0004

struct mgmt_rp_read_info {

	__u8 type;
@@ -55,6 +59,7 @@ struct mgmt_rp_read_info { 
	__u16 manufacturer;

	__u8 hci_ver;

	__u16 hci_rev;

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;



struct mgmt_mode {
@@ -167,6 +172,29 @@ struct mgmt_rp_user_confirm_reply { 


#define MGMT_OP_USER_CONFIRM_NEG_REPLY	0x0016



#define MGMT_OP_SET_LOCAL_NAME		0x0017

struct mgmt_cp_set_local_name {

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;



#define MGMT_OP_READ_LOCAL_OOB_DATA	0x0018

struct mgmt_rp_read_local_oob_data {

	__u8 hash[16];

	__u8 randomizer[16];

} __packed;



#define MGMT_OP_ADD_REMOTE_OOB_DATA	0x0019

struct mgmt_cp_add_remote_oob_data {

	bdaddr_t bdaddr;

	__u8 hash[16];

	__u8 randomizer[16];

} __packed;



#define MGMT_OP_REMOVE_REMOTE_OOB_DATA	0x001A

struct mgmt_cp_remove_remote_oob_data {

	bdaddr_t bdaddr;

} __packed;



#define MGMT_EV_CMD_COMPLETE		0x0001

struct mgmt_ev_cmd_complete {

	__le16 opcode;
@@ -234,3 +262,22 @@ struct mgmt_ev_auth_failed { 
	bdaddr_t bdaddr;

	__u8 status;

} __packed;



#define MGMT_EV_LOCAL_NAME_CHANGED	0x0011

struct mgmt_ev_local_name_changed {

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;



#define MGMT_EV_DEVICE_FOUND		0x0012

struct mgmt_ev_device_found {

	bdaddr_t bdaddr;

	__u8 dev_class[3];

	__s8 rssi;

	__u8 eir[HCI_MAX_EIR_LENGTH];

} __packed;



#define MGMT_EV_REMOTE_NAME		0x0013

struct mgmt_ev_remote_name {

	bdaddr_t bdaddr;

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;