Commit 7abccdba authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2015-04-04

Here's what's probably the last bluetooth-next pull request for 4.1:

 - Fixes for LE advertising data & advertising parameters
 - Fix for race condition with HCI_RESET flag
 - New BNEPGETSUPPFEAT ioctl, needed for certification
 - New HCI request callback type to get the resulting skb
 - Cleanups to use BIT() macro wherever possible
 - Consolidate Broadcom device entries in the btusb HCI driver
 - Check for valid flags in CMTP, HIDP & BNEP
 - Disallow local privacy & OOB data combo to prevent a potential race
 - Expose SMP & ECDH selftest results through debugfs
 - Expose current Device ID info through debugfs

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c85d6975 38c8af60

drivers/bluetooth/btusb.c

+4 −8
Original line number Diff line number Diff line
@@ -111,13 +111,7 @@ static const struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0b05, 0x17b5) },

	{ USB_DEVICE(0x0b05, 0x17cb) },

	{ USB_DEVICE(0x413c, 0x8197) },

	{ USB_DEVICE(0x13d3, 0x3404),

	  .driver_info = BTUSB_BCM_PATCHRAM },



	/* Broadcom BCM20702B0 (Dynex/Insignia) */

	{ USB_DEVICE(0x19ff, 0x0239), .driver_info = BTUSB_BCM_PATCHRAM },
@@ -139,10 +133,12 @@ static const struct usb_device_id btusb_table[] = { 
	  .driver_info = BTUSB_BCM_PATCHRAM },



	/* Belkin F8065bf - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) },

	{ USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01),

	  .driver_info = BTUSB_BCM_PATCHRAM },



	/* IMC Networks - Broadcom based */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) },

	{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01),

	  .driver_info = BTUSB_BCM_PATCHRAM },



	/* Intel Bluetooth USB Bootloader (RAM module) */

	{ USB_DEVICE(0x8087, 0x0a5a),

drivers/bluetooth/hci_ldisc.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags) 
				    BIT(HCI_UART_INIT_PENDING) |

				    BIT(HCI_UART_EXT_CONFIG);



	if ((flags & ~valid_flags))

	if (flags & ~valid_flags)

		return -EINVAL;



	hu->hdev_flags = flags;

fs/compat_ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, void __user *argp) 
#define BNEPCONNDEL	_IOW('B', 201, int)

#define BNEPGETCONNLIST	_IOR('B', 210, int)

#define BNEPGETCONNINFO	_IOR('B', 211, int)

#define BNEPGETSUPPFEAT	_IOR('B', 212, int)



#define CMTPCONNADD	_IOW('C', 200, int)

#define CMTPCONNDEL	_IOW('C', 201, int)
@@ -1247,6 +1248,7 @@ COMPATIBLE_IOCTL(BNEPCONNADD) 
COMPATIBLE_IOCTL(BNEPCONNDEL)

COMPATIBLE_IOCTL(BNEPGETCONNLIST)

COMPATIBLE_IOCTL(BNEPGETCONNINFO)

COMPATIBLE_IOCTL(BNEPGETSUPPFEAT)

COMPATIBLE_IOCTL(CMTPCONNADD)

COMPATIBLE_IOCTL(CMTPCONNDEL)

COMPATIBLE_IOCTL(CMTPGETCONNLIST)

include/net/bluetooth/bluetooth.h

+16 −7
Original line number Diff line number Diff line
@@ -269,11 +269,23 @@ struct l2cap_ctrl { 
	__u16	reqseq;

	__u16	txseq;

	__u8	retries;

	__le16  psm;

	bdaddr_t bdaddr;

	struct l2cap_chan *chan;

};



struct hci_dev;



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

typedef void (*hci_req_complete_skb_t)(struct hci_dev *hdev, u8 status,

				       u16 opcode, struct sk_buff *skb);



struct req_ctrl {

	bool start;

	u8 event;

	hci_req_complete_t complete;

	hci_req_complete_skb_t complete_skb;

};



struct bt_skb_cb {

	__u8 pkt_type;
@@ -281,13 +293,10 @@ struct bt_skb_cb { 
	__u16 opcode;

	__u16 expect;

	__u8 incoming:1;

	__u8 req_start:1;

	u8 req_event;

	hci_req_complete_t req_complete;

	struct l2cap_chan *chan;

	struct l2cap_ctrl control;

	bdaddr_t bdaddr;

	__le16 psm;

	union {

		struct l2cap_ctrl l2cap;

		struct req_ctrl req;

	};

};

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

include/net/bluetooth/hci_core.h

+1 −6
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ struct hci_dev { 
	struct sk_buff_head	raw_q;

	struct sk_buff_head	cmd_q;



	struct sk_buff		*recv_evt;

	struct sk_buff		*sent_cmd;

	struct sk_buff		*reassembly[NUM_REASSEMBLY];
@@ -334,6 +333,7 @@ struct hci_dev { 
	wait_queue_head_t	req_wait_q;

	__u32			req_status;

	__u32			req_result;

	struct sk_buff		*req_skb;



	void			*smp_data;

	void			*smp_bredr_data;
@@ -1284,8 +1284,6 @@ static inline int hci_check_conn_params(u16 min, u16 max, u16 latency, 
int hci_register_cb(struct hci_cb *hcb);

int hci_unregister_cb(struct hci_cb *hcb);



bool hci_req_pending(struct hci_dev *hdev);



struct sk_buff *__hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,

			       const void *param, u32 timeout);

struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,
@@ -1393,9 +1391,6 @@ 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);

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

void mgmt_read_local_oob_data_complete(struct hci_dev *hdev, u8 *hash192,

				       u8 *rand192, u8 *hash256, u8 *rand256,

				       u8 status);

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

		       u8 addr_type, u8 *dev_class, s8 rssi, u32 flags,

		       u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE