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

Commit d2ff5ee9 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 b3117494 2b2fec4d

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0b05, 0x17b5) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x413c, 0x8197) },

include/net/bluetooth/hci.h

+21 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ enum { 
#define HCI_DISCONN_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_PAIRING_TIMEOUT	msecs_to_jiffies(60000)	/* 60 seconds */

#define HCI_INIT_TIMEOUT	msecs_to_jiffies(10000)	/* 10 seconds */

#define HCI_CMD_TIMEOUT		msecs_to_jiffies(1000)	/* 1 second */

#define HCI_CMD_TIMEOUT		msecs_to_jiffies(2000)	/* 2 seconds */

#define HCI_ACL_TX_TIMEOUT	msecs_to_jiffies(45000)	/* 45 seconds */

#define HCI_AUTO_OFF_TIMEOUT	msecs_to_jiffies(2000)	/* 2 seconds */
@@ -319,6 +319,9 @@ enum { 
#define HCI_FLOW_CTL_MODE_PACKET_BASED	0x00

#define HCI_FLOW_CTL_MODE_BLOCK_BASED	0x01



/* The core spec defines 127 as the "not available" value */

#define HCI_TX_POWER_INVALID	127



/* Extended Inquiry Response field types */

#define EIR_FLAGS		0x01 /* flags */

#define EIR_UUID16_SOME		0x02 /* 16-bit UUID, more available */
@@ -335,6 +338,13 @@ enum { 
#define EIR_SSP_RAND_R		0x0F /* Simple Pairing Randomizer R */

#define EIR_DEVICE_ID		0x10 /* device ID */



/* Low Energy Advertising Flags */

#define LE_AD_LIMITED		0x01 /* Limited Discoverable */

#define LE_AD_GENERAL		0x02 /* General Discoverable */

#define LE_AD_NO_BREDR		0x04 /* BR/EDR not supported */

#define LE_AD_SIM_LE_BREDR_CTRL	0x08 /* Simultaneous LE & BR/EDR Controller */

#define LE_AD_SIM_LE_BREDR_HOST	0x10 /* Simultaneous LE & BR/EDR Host */



/* -----  HCI Commands ---- */

#define HCI_OP_NOP			0x0000
@@ -939,6 +949,16 @@ struct hci_rp_le_read_adv_tx_power { 
	__s8	tx_power;

} __packed;



#define HCI_MAX_AD_LENGTH		31



#define HCI_OP_LE_SET_ADV_DATA		0x2008

struct hci_cp_le_set_adv_data {

	__u8	length;

	__u8	data[HCI_MAX_AD_LENGTH];

} __packed;



#define HCI_OP_LE_SET_ADV_ENABLE	0x200a



#define HCI_OP_LE_SET_SCAN_PARAM	0x200b

struct hci_cp_le_set_scan_param {

	__u8    type;

include/net/bluetooth/hci_core.h

+4 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ struct hci_dev { 
	struct le_scan_params	le_scan_params;



	__s8			adv_tx_power;

	__u8			adv_data[HCI_MAX_AD_LENGTH];

	__u8			adv_data_len;



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

	int (*close)(struct hci_dev *hdev);
@@ -734,6 +736,8 @@ 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);

include/net/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -811,6 +811,6 @@ 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);

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



#endif /* __L2CAP_H */

net/bluetooth/amp.c

+6 −2
Original line number Diff line number Diff line
@@ -386,13 +386,17 @@ void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon) 


	bredr_chan = mgr->bredr_chan;



	l2cap_chan_lock(bredr_chan);



	set_bit(FLAG_EFS_ENABLE, &bredr_chan->flags);

	bredr_chan->remote_amp_id = hs_hcon->remote_id;

	bredr_chan->local_amp_id = hs_hcon->hdev->id;

	bredr_chan->hs_hcon = hs_hcon;

	bredr_chan->conn->mtu = hs_hcon->hdev->block_mtu;

	bredr_chan->fcs = L2CAP_FCS_NONE;



	l2cap_physical_cfm(bredr_chan, 0);

	__l2cap_physical_cfm(bredr_chan, 0);



	l2cap_chan_unlock(bredr_chan);



	hci_dev_put(bredr_hdev);

}