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

Commit 48b81cc1 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 31c5770b 0227c7b5

drivers/bluetooth/btmrvl_sdio.c

+4 −4
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = { 
};



static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {

	.helper		= "sd8688_helper.bin",

	.firmware	= "sd8688.bin",

	.helper		= "mrvl/sd8688_helper.bin",

	.firmware	= "mrvl/sd8688.bin",

	.reg		= &btmrvl_reg_8688,

	.sd_blksz_fw_dl	= 64,

};
@@ -1185,7 +1185,7 @@ MODULE_AUTHOR("Marvell International Ltd."); 
MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);

MODULE_VERSION(VERSION);

MODULE_LICENSE("GPL v2");

MODULE_FIRMWARE("sd8688_helper.bin");

MODULE_FIRMWARE("sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8688_helper.bin");

MODULE_FIRMWARE("mrvl/sd8688.bin");

MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");

MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");

include/net/bluetooth/bluetooth.h

+11 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ struct bt_sock_list { 
};



int  bt_sock_register(int proto, const struct net_proto_family *ops);

int  bt_sock_unregister(int proto);

void bt_sock_unregister(int proto);

void bt_sock_link(struct bt_sock_list *l, struct sock *s);

void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);

int  bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
@@ -260,12 +260,22 @@ struct l2cap_ctrl { 
	__u8		retries;

};



struct hci_dev;



typedef void (*hci_req_complete_t)(struct hci_dev *hdev, u8 status);



struct hci_req_ctrl {

	bool			start;

	hci_req_complete_t	complete;

};



struct bt_skb_cb {

	__u8 pkt_type;

	__u8 incoming;

	__u16 expect;

	__u8 force_active;

	struct l2cap_ctrl control;

	struct hci_req_ctrl req;

};

#define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))

include/net/bluetooth/hci.h

+20 −1
Original line number Diff line number Diff line
@@ -119,10 +119,16 @@ enum { 
	HCI_CONNECTABLE,

	HCI_DISCOVERABLE,

	HCI_LINK_SECURITY,

	HCI_PENDING_CLASS,

	HCI_PERIODIC_INQ,

	HCI_FAST_CONNECTABLE,

};



/* A mask for the flags that are supposed to remain when a reset happens

 * or the HCI device is closed.

 */

#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \

			      BIT(HCI_FAST_CONNECTABLE))



/* HCI ioctl defines */

#define HCIDEVUP	_IOW('H', 201, int)

#define HCIDEVDOWN	_IOW('H', 202, int)
@@ -881,12 +887,25 @@ struct hci_rp_read_data_block_size { 
	__le16   num_blocks;

} __packed;



#define HCI_OP_READ_PAGE_SCAN_ACTIVITY	0x0c1b

struct hci_rp_read_page_scan_activity {

	__u8     status;

	__le16   interval;

	__le16   window;

} __packed;



#define HCI_OP_WRITE_PAGE_SCAN_ACTIVITY	0x0c1c

struct hci_cp_write_page_scan_activity {

	__le16   interval;

	__le16   window;

} __packed;



#define HCI_OP_READ_PAGE_SCAN_TYPE	0x0c46

struct hci_rp_read_page_scan_type {

	__u8     status;

	__u8     type;

} __packed;



#define HCI_OP_WRITE_PAGE_SCAN_TYPE	0x0c47

	#define PAGE_SCAN_TYPE_STANDARD		0x00

	#define PAGE_SCAN_TYPE_INTERLACED	0x01

include/net/bluetooth/hci_core.h

+22 −6
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ struct hci_dev { 
	__u16		voice_setting;

	__u8		io_capability;

	__s8		inq_tx_power;

	__u16		page_scan_interval;

	__u16		page_scan_window;

	__u8		page_scan_type;



	__u16		devid_source;

	__u16		devid_vendor;

	__u16		devid_product;
@@ -248,8 +252,6 @@ struct hci_dev { 
	__u32			req_status;

	__u32			req_result;



	__u16			init_last_cmd;



	struct list_head	mgmt_pending;



	struct discovery_state	discovery;
@@ -574,7 +576,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev, 
	return NULL;

}



void hci_acl_disconn(struct hci_conn *conn, __u8 reason);

void hci_disconnect(struct hci_conn *conn, __u8 reason);

void hci_setup_sync(struct hci_conn *conn, __u16 handle);

void hci_sco_setup(struct hci_conn *conn, __u8 status);
@@ -742,8 +744,6 @@ 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);



int hci_update_ad(struct hci_dev *hdev);



void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);



int hci_recv_frame(struct sk_buff *skb);
@@ -1041,6 +1041,22 @@ static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data, 
int hci_register_cb(struct hci_cb *hcb);

int hci_unregister_cb(struct hci_cb *hcb);



struct hci_request {

	struct hci_dev		*hdev;

	struct sk_buff_head	cmd_q;



	/* If something goes wrong when building the HCI request, the error

	 * value is stored in this field.

	 */

	int			err;

};



void hci_req_init(struct hci_request *req, struct hci_dev *hdev);

int hci_req_run(struct hci_request *req, hci_req_complete_t complete);

void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);

void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status);

void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status);



int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);

void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags);

void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb);
@@ -1153,7 +1169,7 @@ 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_req_complete(struct hci_dev *hdev, __u16 cmd, int result);

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

include/net/bluetooth/rfcomm.h

+0 −6
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ struct rfcomm_session { 
	struct timer_list timer;

	unsigned long    state;

	unsigned long    flags;

	atomic_t         refcnt;

	int              initiator;



	/* Default DLC parameters */
@@ -276,11 +275,6 @@ static inline void rfcomm_dlc_unthrottle(struct rfcomm_dlc *d) 
void   rfcomm_session_getaddr(struct rfcomm_session *s, bdaddr_t *src,

								bdaddr_t *dst);



static inline void rfcomm_session_hold(struct rfcomm_session *s)

{

	atomic_inc(&s->refcnt);

}



/* ---- RFCOMM sockets ---- */

struct sockaddr_rc {

	sa_family_t	rc_family;