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

Commit fd29d2cd 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 f95f59fe 4d042654

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ L: linux-scsi@vger.kernel.org 
S:	Maintained

F:	drivers/scsi/53c700*



6LOWPAN GENERIC (BTLE/IEEE 802.15.4)

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

L:	linux-bluetooth@vger.kernel.org

S:	Maintained

F:	net/6lowpan/



6PACK NETWORK DRIVER FOR AX.25

M:	Andreas Koensgen <ajk@comnets.uni-bremen.de>

L:	linux-hams@vger.kernel.org

drivers/bluetooth/hci_ldisc.c

+23 −2
Original line number Diff line number Diff line
@@ -431,6 +431,9 @@ static int hci_uart_register_dev(struct hci_uart *hu) 
	if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags))

		set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);



	if (test_bit(HCI_UART_EXT_CONFIG, &hu->hdev_flags))

		set_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks);



	if (!test_bit(HCI_UART_RESET_ON_INIT, &hu->hdev_flags))

		set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
@@ -477,6 +480,22 @@ static int hci_uart_set_proto(struct hci_uart *hu, int id) 
	return 0;

}



static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags)

{

	unsigned long valid_flags = BIT(HCI_UART_RAW_DEVICE) |

				    BIT(HCI_UART_RESET_ON_INIT) |

				    BIT(HCI_UART_CREATE_AMP) |

				    BIT(HCI_UART_INIT_PENDING) |

				    BIT(HCI_UART_EXT_CONFIG);



	if ((flags & ~valid_flags))

		return -EINVAL;



	hu->hdev_flags = flags;



	return 0;

}



/* hci_uart_tty_ioctl()

 *

 *    Process IOCTL system call for the tty device.
@@ -520,14 +539,16 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file, 
		return -EUNATCH;



	case HCIUARTGETDEVICE:

		if (test_bit(HCI_UART_PROTO_SET, &hu->flags))

		if (test_bit(HCI_UART_REGISTERED, &hu->flags))

			return hu->hdev->id;

		return -EUNATCH;



	case HCIUARTSETFLAGS:

		if (test_bit(HCI_UART_PROTO_SET, &hu->flags))

			return -EBUSY;

		hu->hdev_flags = arg;

		err = hci_uart_set_flags(hu, arg);

		if (err)

			return err;

		break;



	case HCIUARTGETFLAGS:

drivers/bluetooth/hci_uart.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#define HCI_UART_RESET_ON_INIT	1

#define HCI_UART_CREATE_AMP	2

#define HCI_UART_INIT_PENDING	3

#define HCI_UART_EXT_CONFIG	4



struct hci_uart;

fs/compat_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#include <linux/gfp.h>



#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci.h>

#include <net/bluetooth/hci_sock.h>

#include <net/bluetooth/rfcomm.h>



#include <linux/capi.h>

include/net/bluetooth/hci.h

+1 −149
Original line number Diff line number Diff line
@@ -202,33 +202,6 @@ enum { 
#define HCI_PERSISTENT_MASK (BIT(HCI_LE_SCAN) | BIT(HCI_PERIODIC_INQ) | \

			      BIT(HCI_FAST_CONNECTABLE) | BIT(HCI_LE_ADV))



/* HCI ioctl defines */

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

#define HCIDEVDOWN	_IOW('H', 202, int)

#define HCIDEVRESET	_IOW('H', 203, int)

#define HCIDEVRESTAT	_IOW('H', 204, int)



#define HCIGETDEVLIST	_IOR('H', 210, int)

#define HCIGETDEVINFO	_IOR('H', 211, int)

#define HCIGETCONNLIST	_IOR('H', 212, int)

#define HCIGETCONNINFO	_IOR('H', 213, int)

#define HCIGETAUTHINFO	_IOR('H', 215, int)



#define HCISETRAW	_IOW('H', 220, int)

#define HCISETSCAN	_IOW('H', 221, int)

#define HCISETAUTH	_IOW('H', 222, int)

#define HCISETENCRYPT	_IOW('H', 223, int)

#define HCISETPTYPE	_IOW('H', 224, int)

#define HCISETLINKPOL	_IOW('H', 225, int)

#define HCISETLINKMODE	_IOW('H', 226, int)

#define HCISETACLMTU	_IOW('H', 227, int)

#define HCISETSCOMTU	_IOW('H', 228, int)



#define HCIBLOCKADDR	_IOW('H', 230, int)

#define HCIUNBLOCKADDR	_IOW('H', 231, int)



#define HCIINQUIRY	_IOR('H', 240, int)



/* HCI timeouts */

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

#define HCI_PAIRING_TIMEOUT	msecs_to_jiffies(60000)	/* 60 seconds */
@@ -356,6 +329,7 @@ enum { 
#define LMP_HOST_SC		0x08



/* LE features */

#define HCI_LE_ENCRYPTION		0x01

#define HCI_LE_CONN_PARAM_REQ_PROC	0x02

#define HCI_LE_PING			0x10
@@ -1871,126 +1845,4 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb) 
#define hci_handle(h)		(h & 0x0fff)

#define hci_flags(h)		(h >> 12)



/* ---- HCI Sockets ---- */



/* Socket options */

#define HCI_DATA_DIR	1

#define HCI_FILTER	2

#define HCI_TIME_STAMP	3



/* CMSG flags */

#define HCI_CMSG_DIR	0x0001

#define HCI_CMSG_TSTAMP	0x0002



struct sockaddr_hci {

	sa_family_t    hci_family;

	unsigned short hci_dev;

	unsigned short hci_channel;

};

#define HCI_DEV_NONE	0xffff



#define HCI_CHANNEL_RAW		0

#define HCI_CHANNEL_USER	1

#define HCI_CHANNEL_MONITOR	2

#define HCI_CHANNEL_CONTROL	3



struct hci_filter {

	unsigned long type_mask;

	unsigned long event_mask[2];

	__le16 opcode;

};



struct hci_ufilter {

	__u32  type_mask;

	__u32  event_mask[2];

	__le16 opcode;

};



#define HCI_FLT_TYPE_BITS	31

#define HCI_FLT_EVENT_BITS	63

#define HCI_FLT_OGF_BITS	63

#define HCI_FLT_OCF_BITS	127



/* ---- HCI Ioctl requests structures ---- */

struct hci_dev_stats {

	__u32 err_rx;

	__u32 err_tx;

	__u32 cmd_tx;

	__u32 evt_rx;

	__u32 acl_tx;

	__u32 acl_rx;

	__u32 sco_tx;

	__u32 sco_rx;

	__u32 byte_rx;

	__u32 byte_tx;

};



struct hci_dev_info {

	__u16 dev_id;

	char  name[8];



	bdaddr_t bdaddr;



	__u32 flags;

	__u8  type;



	__u8  features[8];



	__u32 pkt_type;

	__u32 link_policy;

	__u32 link_mode;



	__u16 acl_mtu;

	__u16 acl_pkts;

	__u16 sco_mtu;

	__u16 sco_pkts;



	struct hci_dev_stats stat;

};



struct hci_conn_info {

	__u16    handle;

	bdaddr_t bdaddr;

	__u8     type;

	__u8     out;

	__u16    state;

	__u32    link_mode;

};



struct hci_dev_req {

	__u16  dev_id;

	__u32  dev_opt;

};



struct hci_dev_list_req {

	__u16  dev_num;

	struct hci_dev_req dev_req[0];	/* hci_dev_req structures */

};



struct hci_conn_list_req {

	__u16  dev_id;

	__u16  conn_num;

	struct hci_conn_info conn_info[0];

};



struct hci_conn_info_req {

	bdaddr_t bdaddr;

	__u8     type;

	struct   hci_conn_info conn_info[0];

};



struct hci_auth_info_req {

	bdaddr_t bdaddr;

	__u8     type;

};



struct hci_inquiry_req {

	__u16 dev_id;

	__u16 flags;

	__u8  lap[3];

	__u8  length;

	__u8  num_rsp;

};

#define IREQ_CACHE_FLUSH 0x0001



#endif /* __HCI_H */