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

Commit 0f496df2 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 56e1bd77 9b008c04

include/net/bluetooth/a2mp.h

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ enum amp_mgr_state { 
	READ_LOC_AMP_INFO,

	READ_LOC_AMP_ASSOC,

	READ_LOC_AMP_ASSOC_FINAL,

	WRITE_REMOTE_AMP_ASSOC,

};



struct amp_mgr {
@@ -33,7 +34,7 @@ struct amp_mgr { 
	struct kref		kref;

	__u8			ident;

	__u8			handle;

	enum amp_mgr_state	state;

	unsigned long		state;

	unsigned long		flags;



	struct list_head	amp_ctrls;
@@ -144,5 +145,6 @@ void a2mp_discover_amp(struct l2cap_chan *chan); 
void a2mp_send_getinfo_rsp(struct hci_dev *hdev);

void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status);

void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status);

void a2mp_send_create_phy_link_rsp(struct hci_dev *hdev, u8 status);



#endif /* __A2MP_H */

include/net/bluetooth/bluetooth.h

+23 −0
Original line number Diff line number Diff line
@@ -166,6 +166,29 @@ typedef struct { 
#define BDADDR_LE_PUBLIC	0x01

#define BDADDR_LE_RANDOM	0x02



static inline bool bdaddr_type_is_valid(__u8 type)

{

	switch (type) {

	case BDADDR_BREDR:

	case BDADDR_LE_PUBLIC:

	case BDADDR_LE_RANDOM:

		return true;

	}



	return false;

}



static inline bool bdaddr_type_is_le(__u8 type)

{

	switch (type) {

	case BDADDR_LE_PUBLIC:

	case BDADDR_LE_RANDOM:

		return true;

	}



	return false;

}



#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0} })

#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff} })

include/net/bluetooth/hci.h

+18 −0
Original line number Diff line number Diff line
@@ -943,6 +943,12 @@ struct hci_rp_le_read_buffer_size { 
	__u8     le_max_pkt;

} __packed;



#define HCI_OP_LE_READ_LOCAL_FEATURES	0x2003

struct hci_rp_le_read_local_features {

	__u8     status;

	__u8     features[8];

} __packed;



#define HCI_OP_LE_READ_ADV_TX_POWER	0x2007

struct hci_rp_le_read_adv_tx_power {

	__u8	status;
@@ -995,6 +1001,12 @@ struct hci_cp_le_create_conn { 


#define HCI_OP_LE_CREATE_CONN_CANCEL	0x200e



#define HCI_OP_LE_READ_WHITE_LIST_SIZE	0x200f

struct hci_rp_le_read_white_list_size {

	__u8	status;

	__u8	size;

} __packed;



#define HCI_OP_LE_CONN_UPDATE		0x2013

struct hci_cp_le_conn_update {

	__le16   handle;
@@ -1033,6 +1045,12 @@ struct hci_rp_le_ltk_neg_reply { 
	__le16	handle;

} __packed;



#define HCI_OP_LE_READ_SUPPORTED_STATES	0x201c

struct hci_rp_le_read_supported_states {

	__u8	status;

	__u8	le_states[8];

} __packed;



/* ---- HCI Events ---- */

#define HCI_EV_INQUIRY_COMPLETE		0x01

include/net/bluetooth/hci_core.h

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ struct hci_dev { 
	__u8		minor_class;

	__u8		features[8];

	__u8		host_features[8];

	__u8		le_features[8];

	__u8		le_white_list_size;

	__u8		le_states[8];

	__u8		commands[64];

	__u8		hci_ver;

	__u16		hci_rev;
@@ -216,6 +219,7 @@ struct hci_dev { 
	unsigned long	le_last_tx;



	struct workqueue_struct	*workqueue;

	struct workqueue_struct	*req_workqueue;



	struct work_struct	power_on;

	struct delayed_work	power_off;

include/net/bluetooth/l2cap.h

+0 −1
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ struct l2cap_chan { 
	__u16		frames_sent;

	__u16		unacked_frames;

	__u8		retry_count;

	__u16		srej_queue_next;

	__u16		sdu_len;

	struct sk_buff	*sdu;

	struct sk_buff	*sdu_last_frag;