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

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

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
parents 38141fcf 0c0afedf

include/net/bluetooth/amp.h

+4 −0
Original line number Diff line number Diff line
@@ -46,5 +46,9 @@ void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr, 
			struct hci_conn *hcon);

void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle);

void amp_write_rem_assoc_continue(struct hci_dev *hdev, u8 handle);

void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon);

void amp_create_logical_link(struct l2cap_chan *chan);

void amp_disconnect_logical_link(struct hci_chan *hchan);

void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason);



#endif /* __AMP_H */

include/net/bluetooth/hci.h

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ enum { 
	HCI_SSP_ENABLED,

	HCI_HS_ENABLED,

	HCI_LE_ENABLED,

	HCI_LE_PERIPHERAL,

	HCI_CONNECTABLE,

	HCI_DISCOVERABLE,

	HCI_LINK_SECURITY,
@@ -932,6 +933,12 @@ struct hci_rp_le_read_buffer_size { 
	__u8     le_max_pkt;

} __packed;



#define HCI_OP_LE_READ_ADV_TX_POWER	0x2007

struct hci_rp_le_read_adv_tx_power {

	__u8	status;

	__s8	tx_power;

} __packed;



#define HCI_OP_LE_SET_SCAN_PARAM	0x200b

struct hci_cp_le_set_scan_param {

	__u8    type;

include/net/bluetooth/hci_core.h

+27 −17
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ struct hci_dev { 
	struct work_struct	le_scan;

	struct le_scan_params	le_scan_params;



	__s8			adv_tx_power;



	int (*open)(struct hci_dev *hdev);

	int (*close)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);
@@ -355,6 +357,7 @@ struct hci_chan { 
	struct hci_conn *conn;

	struct sk_buff_head data_q;

	unsigned int	sent;

	__u8		state;

};



extern struct list_head hci_dev_list;
@@ -682,7 +685,7 @@ static inline uint8_t __hci_num_ctrl(void) 
}



struct hci_dev *hci_dev_get(int index);

struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);

struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src);



struct hci_dev *hci_alloc_dev(void);

void hci_free_dev(struct hci_dev *hdev);
@@ -747,18 +750,29 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 
#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->dev.parent = (pdev))



/* ----- LMP capabilities ----- */

#define lmp_rswitch_capable(dev)   ((dev)->features[0] & LMP_RSWITCH)

#define lmp_encrypt_capable(dev)   ((dev)->features[0] & LMP_ENCRYPT)

#define lmp_rswitch_capable(dev)   ((dev)->features[0] & LMP_RSWITCH)

#define lmp_hold_capable(dev)      ((dev)->features[0] & LMP_HOLD)

#define lmp_sniff_capable(dev)     ((dev)->features[0] & LMP_SNIFF)

#define lmp_sniffsubr_capable(dev) ((dev)->features[5] & LMP_SNIFF_SUBR)

#define lmp_park_capable(dev)      ((dev)->features[1] & LMP_PARK)

#define lmp_inq_rssi_capable(dev)  ((dev)->features[3] & LMP_RSSI_INQ)

#define lmp_esco_capable(dev)      ((dev)->features[3] & LMP_ESCO)

#define lmp_bredr_capable(dev)     (!((dev)->features[4] & LMP_NO_BREDR))

#define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)

#define lmp_sniffsubr_capable(dev) ((dev)->features[5] & LMP_SNIFF_SUBR)

#define lmp_pause_enc_capable(dev) ((dev)->features[5] & LMP_PAUSE_ENC)

#define lmp_ext_inq_capable(dev)   ((dev)->features[6] & LMP_EXT_INQ)

#define lmp_le_br_capable(dev)     ((dev)->features[6] & LMP_SIMUL_LE_BR)

#define lmp_ssp_capable(dev)       ((dev)->features[6] & LMP_SIMPLE_PAIR)

#define lmp_no_flush_capable(dev)  ((dev)->features[6] & LMP_NO_FLUSH)

#define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)

#define lmp_bredr_capable(dev)     (!((dev)->features[4] & LMP_NO_BREDR))

#define lmp_lsto_capable(dev)      ((dev)->features[7] & LMP_LSTO)

#define lmp_inq_tx_pwr_capable(dev) ((dev)->features[7] & LMP_INQ_TX_PWR)

#define lmp_ext_feat_capable(dev)  ((dev)->features[7] & LMP_EXTFEATURES)



/* ----- Extended LMP capabilities ----- */

#define lmp_host_ssp_capable(dev)  ((dev)->host_features[0] & LMP_HOST_SSP)

#define lmp_host_le_capable(dev)   ((dev)->host_features[0] & LMP_HOST_LE)

#define lmp_host_le_br_capable(dev) ((dev)->host_features[0] & LMP_HOST_LE_BREDR)



/* ----- HCI protocols ----- */

static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr,
@@ -877,7 +891,7 @@ struct hci_cb { 


static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)

{

	struct list_head *p;

	struct hci_cb *cb;

	__u8 encrypt;



	hci_proto_auth_cfm(conn, status);
@@ -888,8 +902,7 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status) 
	encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;



	read_lock(&hci_cb_list_lock);

	list_for_each(p, &hci_cb_list) {

		struct hci_cb *cb = list_entry(p, struct hci_cb, list);

	list_for_each_entry(cb, &hci_cb_list, list) {

		if (cb->security_cfm)

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

	}
@@ -899,7 +912,7 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status) 
static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,

								__u8 encrypt)

{

	struct list_head *p;

	struct hci_cb *cb;



	if (conn->sec_level == BT_SECURITY_SDP)

		conn->sec_level = BT_SECURITY_LOW;
@@ -910,8 +923,7 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status, 
	hci_proto_encrypt_cfm(conn, status, encrypt);



	read_lock(&hci_cb_list_lock);

	list_for_each(p, &hci_cb_list) {

		struct hci_cb *cb = list_entry(p, struct hci_cb, list);

	list_for_each_entry(cb, &hci_cb_list, list) {

		if (cb->security_cfm)

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

	}
@@ -920,11 +932,10 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status, 


static inline void hci_key_change_cfm(struct hci_conn *conn, __u8 status)

{

	struct list_head *p;

	struct hci_cb *cb;



	read_lock(&hci_cb_list_lock);

	list_for_each(p, &hci_cb_list) {

		struct hci_cb *cb = list_entry(p, struct hci_cb, list);

	list_for_each_entry(cb, &hci_cb_list, list) {

		if (cb->key_change_cfm)

			cb->key_change_cfm(conn, status);

	}
@@ -934,11 +945,10 @@ static inline void hci_key_change_cfm(struct hci_conn *conn, __u8 status) 
static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,

								__u8 role)

{

	struct list_head *p;

	struct hci_cb *cb;



	read_lock(&hci_cb_list_lock);

	list_for_each(p, &hci_cb_list) {

		struct hci_cb *cb = list_entry(p, struct hci_cb, list);

	list_for_each_entry(cb, &hci_cb_list, list) {

		if (cb->role_switch_cfm)

			cb->role_switch_cfm(conn, status, role);

	}

include/net/bluetooth/l2cap.h

+36 −2
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
#define L2CAP_ENC_TIMEOUT		msecs_to_jiffies(5000)

#define L2CAP_CONN_TIMEOUT		msecs_to_jiffies(40000)

#define L2CAP_INFO_TIMEOUT		msecs_to_jiffies(4000)

#define L2CAP_MOVE_TIMEOUT		msecs_to_jiffies(4000)

#define L2CAP_MOVE_ERTX_TIMEOUT		msecs_to_jiffies(60000)



#define L2CAP_A2MP_DEFAULT_MTU		670
@@ -434,6 +436,8 @@ struct l2cap_chan { 
	struct sock *sk;



	struct l2cap_conn	*conn;

	struct hci_conn		*hs_hcon;

	struct hci_chan		*hs_hchan;

	struct kref	kref;



	__u8		state;
@@ -477,6 +481,12 @@ struct l2cap_chan { 
	unsigned long	conn_state;

	unsigned long	flags;



	__u8		remote_amp_id;

	__u8		local_amp_id;

	__u8		move_id;

	__u8		move_state;

	__u8		move_role;



	__u16		next_tx_seq;

	__u16		expected_ack_seq;

	__u16		expected_tx_seq;
@@ -509,8 +519,6 @@ struct l2cap_chan { 
	__u32		remote_acc_lat;

	__u32		remote_flush_to;



	__u8		ctrl_id;



	struct delayed_work	chan_timer;

	struct delayed_work	retrans_timer;

	struct delayed_work	monitor_timer;
@@ -644,6 +652,9 @@ enum { 
enum {

	L2CAP_RX_STATE_RECV,

	L2CAP_RX_STATE_SREJ_SENT,

	L2CAP_RX_STATE_MOVE,

	L2CAP_RX_STATE_WAIT_P,

	L2CAP_RX_STATE_WAIT_F,

};



enum {
@@ -674,6 +685,25 @@ enum { 
	L2CAP_EV_RECV_FRAME,

};



enum {

	L2CAP_MOVE_ROLE_NONE,

	L2CAP_MOVE_ROLE_INITIATOR,

	L2CAP_MOVE_ROLE_RESPONDER,

};



enum {

	L2CAP_MOVE_STABLE,

	L2CAP_MOVE_WAIT_REQ,

	L2CAP_MOVE_WAIT_RSP,

	L2CAP_MOVE_WAIT_RSP_SUCCESS,

	L2CAP_MOVE_WAIT_CONFIRM,

	L2CAP_MOVE_WAIT_CONFIRM_RSP,

	L2CAP_MOVE_WAIT_LOGICAL_COMP,

	L2CAP_MOVE_WAIT_LOGICAL_CFM,

	L2CAP_MOVE_WAIT_LOCAL_BUSY,

	L2CAP_MOVE_WAIT_PREPARE,

};



void l2cap_chan_hold(struct l2cap_chan *c);

void l2cap_chan_put(struct l2cap_chan *c);
@@ -778,5 +808,9 @@ void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan); 
void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);

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

void l2cap_send_conn_req(struct l2cap_chan *chan);

void l2cap_move_start(struct l2cap_chan *chan);

void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,

		       u8 status);

void l2cap_physical_cfm(struct l2cap_chan *chan, int result);



#endif /* __L2CAP_H */

net/bluetooth/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -48,4 +48,3 @@ source "net/bluetooth/cmtp/Kconfig" 
source "net/bluetooth/hidp/Kconfig"



source "drivers/bluetooth/Kconfig"