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

Commit a1775846 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 e46395a4 b8534e0f

include/net/bluetooth/hci.h

+17 −0
Original line number Diff line number Diff line
@@ -415,6 +415,17 @@ struct hci_cp_io_capability_reply { 
	__u8     authentication;

} __packed;



#define HCI_OP_USER_CONFIRM_REPLY		0x042c

struct hci_cp_user_confirm_reply {

	bdaddr_t bdaddr;

} __packed;

struct hci_rp_user_confirm_reply {

	__u8     status;

	bdaddr_t bdaddr;

} __packed;



#define HCI_OP_USER_CONFIRM_NEG_REPLY	0x042d



#define HCI_OP_IO_CAPABILITY_NEG_REPLY	0x0434

struct hci_cp_io_capability_neg_reply {

	bdaddr_t bdaddr;
@@ -936,6 +947,12 @@ struct hci_ev_io_capa_reply { 
	__u8     authentication;

} __packed;



#define HCI_EV_USER_CONFIRM_REQUEST	0x33

struct hci_ev_user_confirm_req {

	bdaddr_t	bdaddr;

	__le32		passkey;

} __packed;



#define HCI_EV_SIMPLE_PAIR_COMPLETE	0x36

struct hci_ev_simple_pair_complete {

	__u8     status;

include/net/bluetooth/hci_core.h

+21 −0
Original line number Diff line number Diff line
@@ -248,6 +248,10 @@ struct hci_conn { 
	void		*priv;



	struct hci_conn	*link;



	void (*connect_cfm_cb)	(struct hci_conn *conn, u8 status);

	void (*security_cfm_cb)	(struct hci_conn *conn, u8 status);

	void (*disconn_cfm_cb)	(struct hci_conn *conn, u8 reason);

};



extern struct hci_proto *hci_proto[];
@@ -571,6 +575,9 @@ static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status) 
	hp = hci_proto[HCI_PROTO_SCO];

	if (hp && hp->connect_cfm)

		hp->connect_cfm(conn, status);



	if (conn->connect_cfm_cb)

		conn->connect_cfm_cb(conn, status);

}



static inline int hci_proto_disconn_ind(struct hci_conn *conn)
@@ -600,6 +607,9 @@ static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason) 
	hp = hci_proto[HCI_PROTO_SCO];

	if (hp && hp->disconn_cfm)

		hp->disconn_cfm(conn, reason);



	if (conn->disconn_cfm_cb)

		conn->disconn_cfm_cb(conn, reason);

}



static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
@@ -619,6 +629,9 @@ static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status) 
	hp = hci_proto[HCI_PROTO_SCO];

	if (hp && hp->security_cfm)

		hp->security_cfm(conn, status, encrypt);



	if (conn->security_cfm_cb)

		conn->security_cfm_cb(conn, status);

}



static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u8 encrypt)
@@ -632,6 +645,9 @@ static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status, __u 
	hp = hci_proto[HCI_PROTO_SCO];

	if (hp && hp->security_cfm)

		hp->security_cfm(conn, status, encrypt);



	if (conn->security_cfm_cb)

		conn->security_cfm_cb(conn, status);

}



int hci_register_proto(struct hci_proto *hproto);
@@ -746,6 +762,11 @@ int mgmt_connect_failed(u16 index, bdaddr_t *bdaddr, u8 status); 
int mgmt_pin_code_request(u16 index, bdaddr_t *bdaddr);

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

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

int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value);

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);



/* HCI info for socket */

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

include/net/bluetooth/mgmt.h

+40 −33
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ 
   SOFTWARE IS DISCLAIMED.

*/



#define MGMT_INDEX_NONE			0xFFFF



struct mgmt_hdr {

	__le16 opcode;

	__le16 index;

	__le16 len;

} __packed;

#define MGMT_HDR_SIZE			4



#define MGMT_OP_READ_VERSION		0x0001

struct mgmt_rp_read_version {
@@ -40,11 +42,7 @@ struct mgmt_rp_read_index_list { 
} __packed;



#define MGMT_OP_READ_INFO		0x0004

struct mgmt_cp_read_info {

	__le16 index;

} __packed;

struct mgmt_rp_read_info {

	__le16 index;

	__u8 type;

	__u8 powered;

	__u8 connectable;
@@ -60,7 +58,6 @@ struct mgmt_rp_read_info { 
} __packed;



struct mgmt_mode {

	__le16 index;

	__u8 val;

} __packed;
@@ -74,27 +71,23 @@ struct mgmt_mode { 


#define MGMT_OP_ADD_UUID		0x0009

struct mgmt_cp_add_uuid {

	__le16 index;

	__u8 uuid[16];

	__u8 svc_hint;

} __packed;



#define MGMT_OP_REMOVE_UUID		0x000A

struct mgmt_cp_remove_uuid {

	__le16 index;

	__u8 uuid[16];

} __packed;



#define MGMT_OP_SET_DEV_CLASS		0x000B

struct mgmt_cp_set_dev_class {

	__le16 index;

	__u8 major;

	__u8 minor;

} __packed;



#define MGMT_OP_SET_SERVICE_CACHE	0x000C

struct mgmt_cp_set_service_cache {

	__le16 index;

	__u8 enable;

} __packed;
@@ -107,7 +100,6 @@ struct mgmt_key_info { 


#define MGMT_OP_LOAD_KEYS		0x000D

struct mgmt_cp_load_keys {

	__le16 index;

	__u8 debug_keys;

	__le16 key_count;

	struct mgmt_key_info keys[0];
@@ -115,51 +107,66 @@ struct mgmt_cp_load_keys { 


#define MGMT_OP_REMOVE_KEY		0x000E

struct mgmt_cp_remove_key {

	__le16 index;

	bdaddr_t bdaddr;

	__u8 disconnect;

} __packed;



#define MGMT_OP_DISCONNECT		0x000F

struct mgmt_cp_disconnect {

	__le16 index;

	bdaddr_t bdaddr;

} __packed;

struct mgmt_rp_disconnect {

	__le16 index;

	bdaddr_t bdaddr;

} __packed;



#define MGMT_OP_GET_CONNECTIONS		0x0010

struct mgmt_cp_get_connections {

	__le16 index;

} __packed;

struct mgmt_rp_get_connections {

	__le16 index;

	__le16 conn_count;

	bdaddr_t conn[0];

} __packed;



#define MGMT_OP_PIN_CODE_REPLY		0x0011

struct mgmt_cp_pin_code_reply {

	__le16 index;

	bdaddr_t bdaddr;

	__u8 pin_len;

	__u8 pin_code[16];

} __packed;

struct mgmt_rp_pin_code_reply {

	bdaddr_t bdaddr;

	uint8_t status;

} __packed;



#define MGMT_OP_PIN_CODE_NEG_REPLY	0x0012

struct mgmt_cp_pin_code_neg_reply {

	__le16 index;

	bdaddr_t bdaddr;

} __packed;



#define MGMT_OP_SET_IO_CAPABILITY	0x0013

struct mgmt_cp_set_io_capability {

	__le16 index;

	__u8 io_capability;

} __packed;



#define MGMT_OP_PAIR_DEVICE		0x0014

struct mgmt_cp_pair_device {

	bdaddr_t bdaddr;

	__u8 io_cap;

} __packed;

struct mgmt_rp_pair_device {

	bdaddr_t bdaddr;

	__u8 status;

} __packed;



#define MGMT_OP_USER_CONFIRM_REPLY	0x0015

struct mgmt_cp_user_confirm_reply {

	bdaddr_t bdaddr;

} __packed;

struct mgmt_rp_user_confirm_reply {

	bdaddr_t bdaddr;

	__u8 status;

} __packed;



#define MGMT_OP_USER_CONFIRM_NEG_REPLY	0x0016



#define MGMT_EV_CMD_COMPLETE		0x0001

struct mgmt_ev_cmd_complete {

	__le16 opcode;
@@ -174,19 +181,12 @@ struct mgmt_ev_cmd_status { 


#define MGMT_EV_CONTROLLER_ERROR	0x0003

struct mgmt_ev_controller_error {

	__le16 index;

	__u8 error_code;

} __packed;



#define MGMT_EV_INDEX_ADDED		0x0004

struct mgmt_ev_index_added {

	__le16 index;

} __packed;



#define MGMT_EV_INDEX_REMOVED		0x0005

struct mgmt_ev_index_removed {

	__le16 index;

} __packed;



#define MGMT_EV_POWERED			0x0006
@@ -198,32 +198,39 @@ struct mgmt_ev_index_removed { 


#define MGMT_EV_NEW_KEY			0x000A

struct mgmt_ev_new_key {

	__le16 index;

	struct mgmt_key_info key;

	__u8 old_key_type;

} __packed;



#define MGMT_EV_CONNECTED		0x000B

struct mgmt_ev_connected {

	__le16 index;

	bdaddr_t bdaddr;

} __packed;



#define MGMT_EV_DISCONNECTED		0x000C

struct mgmt_ev_disconnected {

	__le16 index;

	bdaddr_t bdaddr;

} __packed;



#define MGMT_EV_CONNECT_FAILED		0x000D

struct mgmt_ev_connect_failed {

	__le16 index;

	bdaddr_t bdaddr;

	__u8 status;

} __packed;



#define MGMT_EV_PIN_CODE_REQUEST	0x000E

struct mgmt_ev_pin_code_request {

	__le16 index;

	bdaddr_t bdaddr;

} __packed;



#define MGMT_EV_USER_CONFIRM_REQUEST	0x000F

struct mgmt_ev_user_confirm_request {

	bdaddr_t bdaddr;

	__le32 value;

} __packed;



#define MGMT_EV_AUTH_FAILED		0x0010

struct mgmt_ev_auth_failed {

	bdaddr_t bdaddr;

	__u8 status;

} __packed;

net/bluetooth/af_bluetooth.c

+1 −3
Original line number Diff line number Diff line
@@ -550,10 +550,8 @@ static int __init bt_init(void) 
		goto error;



	err = l2cap_init();

	if (err < 0) {

		hci_sock_cleanup();

	if (err < 0)

		goto sock_err;

	}



	err = sco_init();

	if (err < 0) {

net/bluetooth/hci_conn.c

+5 −3
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) 
	conn->state = BT_OPEN;

	conn->auth_type = HCI_AT_GENERAL_BONDING;

	conn->io_capability = hdev->io_capability;

	conn->remote_auth = 0xff;



	conn->power_save = 1;

	conn->disc_timeout = HCI_DISCONN_TIMEOUT;
@@ -429,10 +430,11 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8 


	if (type == LE_LINK) {

		le = hci_conn_hash_lookup_ba(hdev, LE_LINK, dst);

		if (!le)

		if (le)

			return ERR_PTR(-EBUSY);

		le = hci_conn_add(hdev, LE_LINK, dst);

		if (!le)

			return NULL;

			return ERR_PTR(-ENOMEM);

		if (le->state == BT_OPEN)

			hci_le_connect(le);