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

Commit 33b44342 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 b476d3f1 d78a32a8

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ struct bt_skb_cb { 
	__u8 incoming;

	__u16 expect;

	__u8 force_active;

	struct l2cap_chan *chan;

	struct l2cap_ctrl control;

	struct hci_req_ctrl req;

	bdaddr_t bdaddr;

include/net/bluetooth/hci.h

+23 −12
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ enum { 
	HCI_PAIRABLE,

	HCI_SERVICE_CACHE,

	HCI_DEBUG_KEYS,

	HCI_DUT_MODE,

	HCI_UNREGISTER,

	HCI_USER_CHANNEL,
@@ -125,6 +126,7 @@ enum { 
	HCI_ADVERTISING,

	HCI_CONNECTABLE,

	HCI_DISCOVERABLE,

	HCI_LIMITED_DISCOVERABLE,

	HCI_LINK_SECURITY,

	HCI_PERIODIC_INQ,

	HCI_FAST_CONNECTABLE,
@@ -823,6 +825,12 @@ struct hci_rp_read_num_supported_iac { 


#define HCI_OP_READ_CURRENT_IAC_LAP	0x0c39



#define HCI_OP_WRITE_CURRENT_IAC_LAP	0x0c3a

struct hci_cp_write_current_iac_lap {

	__u8	num_iac;

	__u8	iac_lap[6];

} __packed;



#define HCI_OP_WRITE_INQUIRY_MODE	0x0c45



#define HCI_MAX_EIR_LENGTH		240
@@ -1036,6 +1044,10 @@ struct hci_rp_write_remote_amp_assoc { 
	__u8     phy_handle;

} __packed;



#define HCI_OP_ENABLE_DUT_MODE		0x1803



#define HCI_OP_WRITE_SSP_DEBUG_MODE	0x1804



#define HCI_OP_LE_SET_EVENT_MASK	0x2001

struct hci_cp_le_set_event_mask {

	__u8     mask[8];
@@ -1056,11 +1068,6 @@ struct hci_rp_le_read_local_features { 


#define HCI_OP_LE_SET_RANDOM_ADDR	0x2005



#define LE_ADV_IND			0x00

#define LE_ADV_DIRECT_IND		0x01

#define LE_ADV_SCAN_IND			0x02

#define LE_ADV_NONCONN_IND		0x03



#define HCI_OP_LE_SET_ADV_PARAM		0x2006

struct hci_cp_le_set_adv_param {

	__le16   min_interval;
@@ -1087,6 +1094,12 @@ struct hci_cp_le_set_adv_data { 
	__u8	data[HCI_MAX_AD_LENGTH];

} __packed;



#define HCI_OP_LE_SET_SCAN_RSP_DATA	0x2009

struct hci_cp_le_set_scan_rsp_data {

	__u8	length;

	__u8	data[HCI_MAX_AD_LENGTH];

} __packed;



#define HCI_OP_LE_SET_ADV_ENABLE	0x200a



#define LE_SCAN_PASSIVE			0x00
@@ -1567,11 +1580,11 @@ struct hci_ev_le_ltk_req { 
} __packed;



/* Advertising report event types */

#define ADV_IND		0x00

#define ADV_DIRECT_IND	0x01

#define ADV_SCAN_IND	0x02

#define ADV_NONCONN_IND	0x03

#define ADV_SCAN_RSP	0x04

#define LE_ADV_IND		0x00

#define LE_ADV_DIRECT_IND	0x01

#define LE_ADV_SCAN_IND		0x02

#define LE_ADV_NONCONN_IND	0x03

#define LE_ADV_SCAN_RSP		0x04



#define ADDR_LE_DEV_PUBLIC	0x00

#define ADDR_LE_DEV_RANDOM	0x01
@@ -1779,6 +1792,4 @@ struct hci_inquiry_req { 
};

#define IREQ_CACHE_FLUSH 0x0001



extern bool enable_hs;



#endif /* __HCI_H */

include/net/bluetooth/hci_core.h

+32 −57
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct hci_conn_hash { 
struct bdaddr_list {

	struct list_head list;

	bdaddr_t bdaddr;

	u8 bdaddr_type;

};



struct bt_uuid {
@@ -141,6 +142,7 @@ struct hci_dev { 
	__u8		dev_type;

	bdaddr_t	bdaddr;

	bdaddr_t	static_addr;

	__u8		own_addr_type;

	__u8		dev_name[HCI_MAX_NAME_LENGTH];

	__u8		short_name[HCI_MAX_SHORT_NAME_LENGTH];

	__u8		eir[HCI_MAX_EIR_LENGTH];
@@ -167,6 +169,9 @@ struct hci_dev { 
	__u8		page_scan_type;

	__u16		le_scan_interval;

	__u16		le_scan_window;

	__u16		le_conn_min_interval;

	__u16		le_conn_max_interval;

	__u8		ssp_debug_mode;



	__u16		devid_source;

	__u16		devid_vendor;
@@ -283,6 +288,8 @@ struct hci_dev { 
	__s8			adv_tx_power;

	__u8			adv_data[HCI_MAX_AD_LENGTH];

	__u8			adv_data_len;

	__u8			scan_rsp_data[HCI_MAX_AD_LENGTH];

	__u8			scan_rsp_data_len;



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

	int (*close)(struct hci_dev *hdev);
@@ -311,7 +318,6 @@ struct hci_conn { 
	__u8		attempt;

	__u8		dev_class[3];

	__u8		features[HCI_MAX_PAGES][8];

	__u16		interval;

	__u16		pkt_type;

	__u16		link_policy;

	__u32		link_mode;
@@ -339,8 +345,8 @@ struct hci_conn { 
	struct list_head chan_list;



	struct delayed_work disc_work;

	struct timer_list idle_timer;

	struct timer_list auto_accept_timer;

	struct delayed_work auto_accept_work;

	struct delayed_work idle_work;



	struct device	dev;
@@ -649,7 +655,7 @@ static inline void hci_conn_drop(struct hci_conn *conn) 
		switch (conn->type) {

		case ACL_LINK:

		case LE_LINK:

			del_timer(&conn->idle_timer);

			cancel_delayed_work(&conn->idle_work);

			if (conn->state == BT_CONNECTED) {

				timeo = conn->disc_timeout;

				if (!conn->out)
@@ -730,7 +736,7 @@ int hci_get_auth_info(struct hci_dev *hdev, void __user *arg); 
int hci_inquiry(void __user *arg);



struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev,

					 bdaddr_t *bdaddr);

					 bdaddr_t *bdaddr, u8 type);

int hci_blacklist_clear(struct hci_dev *hdev);

int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
@@ -765,8 +771,6 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count); 
int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);



void hci_init_sysfs(struct hci_dev *hdev);

int hci_add_sysfs(struct hci_dev *hdev);

void hci_del_sysfs(struct hci_dev *hdev);

void hci_conn_init_sysfs(struct hci_conn *conn);

void hci_conn_add_sysfs(struct hci_conn *conn);

void hci_conn_del_sysfs(struct hci_conn *conn);
@@ -1009,34 +1013,6 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type) 
	return false;

}



static inline size_t eir_get_length(u8 *eir, size_t eir_len)

{

	size_t parsed = 0;



	while (parsed < eir_len) {

		u8 field_len = eir[0];



		if (field_len == 0)

			return parsed;



		parsed += field_len + 1;

		eir += field_len + 1;

	}



	return eir_len;

}



static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,

				  u8 data_len)

{

	eir[eir_len++] = sizeof(type) + data_len;

	eir[eir_len++] = type;

	memcpy(&eir[eir_len], data, data_len);

	eir_len += data_len;



	return eir_len;

}



int hci_register_cb(struct hci_cb *hcb);

int hci_unregister_cb(struct hci_cb *hcb);
@@ -1100,10 +1076,11 @@ void mgmt_index_added(struct hci_dev *hdev); 
void mgmt_index_removed(struct hci_dev *hdev);

void mgmt_set_powered_failed(struct hci_dev *hdev, int err);

int mgmt_powered(struct hci_dev *hdev, u8 powered);

int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);

int mgmt_connectable(struct hci_dev *hdev, u8 connectable);

int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

void mgmt_discoverable_timeout(struct hci_dev *hdev);

void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);

void mgmt_connectable(struct hci_dev *hdev, u8 connectable);

void mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);

void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

		       bool persistent);

void mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

			   u8 addr_type, u32 flags, u8 *name, u8 name_len,
@@ -1114,10 +1091,10 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, 
			    u8 link_type, u8 addr_type, u8 status);

void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

			 u8 addr_type, u8 status);

int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure);

int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

void mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure);

void mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				  u8 status);

int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

void mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				      u8 status);

int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,

			      u8 link_type, u8 addr_type, __le32 value,
@@ -1135,14 +1112,14 @@ int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr,

			     u8 link_type, u8 addr_type, u32 passkey,

			     u8 entered);

int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

void mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		      u8 addr_type, u8 status);

int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);

int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);

int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,

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

void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);

void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,

				    u8 status);

int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);

int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);

void mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,

					     u8 *randomizer, u8 status);

void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,

		       u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name,
@@ -1152,7 +1129,7 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
void mgmt_discovering(struct hci_dev *hdev, u8 discovering);

int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);

int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent);

void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent);

void mgmt_reenable_advertising(struct hci_dev *hdev);



/* HCI info for socket */
@@ -1183,8 +1160,6 @@ struct hci_sec_filter { 
#define hci_req_lock(d)		mutex_lock(&d->req_lock)

#define hci_req_unlock(d)	mutex_unlock(&d->req_lock)



void hci_update_ad(struct hci_request *req);



void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,

					u16 latency, u16 to_multiplier);

void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],

include/net/bluetooth/l2cap.h

+16 −4
Original line number Diff line number Diff line
@@ -435,8 +435,6 @@ struct l2cap_seq_list { 
#define L2CAP_SEQ_LIST_TAIL	0x8000



struct l2cap_chan {

	struct sock *sk;



	struct l2cap_conn	*conn;

	struct hci_conn		*hs_hcon;

	struct hci_chan		*hs_hchan;
@@ -551,10 +549,12 @@ struct l2cap_ops { 
	void			(*teardown) (struct l2cap_chan *chan, int err);

	void			(*close) (struct l2cap_chan *chan);

	void			(*state_change) (struct l2cap_chan *chan,

						 int state);

						 int state, int err);

	void			(*ready) (struct l2cap_chan *chan);

	void			(*defer) (struct l2cap_chan *chan);

	void			(*resume) (struct l2cap_chan *chan);

	void			(*set_shutdown) (struct l2cap_chan *chan);

	long			(*get_sndtimeo) (struct l2cap_chan *chan);

	struct sk_buff		*(*alloc_skb) (struct l2cap_chan *chan,

					       unsigned long len, int nb);

};
@@ -795,6 +795,19 @@ static inline void l2cap_chan_no_defer(struct l2cap_chan *chan) 
{

}



static inline void l2cap_chan_no_resume(struct l2cap_chan *chan)

{

}



static inline void l2cap_chan_no_set_shutdown(struct l2cap_chan *chan)

{

}



static inline long l2cap_chan_no_get_sndtimeo(struct l2cap_chan *chan)

{

	return 0;

}



extern bool disable_ertm;



int l2cap_init_sockets(void);
@@ -802,7 +815,6 @@ void l2cap_cleanup_sockets(void); 
bool l2cap_is_socket(struct socket *sock);



void __l2cap_connect_rsp_defer(struct l2cap_chan *chan);

int __l2cap_wait_ack(struct sock *sk);



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

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

net/bluetooth/a2mp.c

+8 −1
Original line number Diff line number Diff line
@@ -672,7 +672,8 @@ static void a2mp_chan_close_cb(struct l2cap_chan *chan) 
	l2cap_chan_put(chan);

}



static void a2mp_chan_state_change_cb(struct l2cap_chan *chan, int state)

static void a2mp_chan_state_change_cb(struct l2cap_chan *chan, int state,

				      int err)

{

	struct amp_mgr *mgr = chan->data;
@@ -709,6 +710,9 @@ static struct l2cap_ops a2mp_chan_ops = { 
	.teardown = l2cap_chan_no_teardown,

	.ready = l2cap_chan_no_ready,

	.defer = l2cap_chan_no_defer,

	.resume = l2cap_chan_no_resume,

	.set_shutdown = l2cap_chan_no_set_shutdown,

	.get_sndtimeo = l2cap_chan_no_get_sndtimeo,

};



static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked)
@@ -832,6 +836,9 @@ struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn, 
{

	struct amp_mgr *mgr;



	if (conn->hcon->type != ACL_LINK)

		return NULL;



	mgr = amp_mgr_create(conn, false);

	if (!mgr) {

		BT_ERR("Could not create AMP manager");