Commit e7b02296 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: Remove BT_HS 

High Speed, Alternate MAC and PHY (AMP) extension, has been removed from
Bluetooth Core specification on 5.3:

https://www.bluetooth.com/blog/new-core-specification-v5-3-feature-enhancements/



Fixes: 244bc377 ("Bluetooth: Add BT_HS config option")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent b79e0409

include/net/bluetooth/hci.h

+0 −1
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ enum { 
	HCI_LIMITED_PRIVACY,

	HCI_RPA_EXPIRED,

	HCI_RPA_RESOLVING,

	HCI_HS_ENABLED,

	HCI_LE_ENABLED,

	HCI_ADVERTISING,

	HCI_ADVERTISING_CONNECTABLE,

include/net/bluetooth/l2cap.h

+0 −42
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ 
#define L2CAP_WAIT_ACK_POLL_PERIOD	msecs_to_jiffies(200)

#define L2CAP_WAIT_ACK_TIMEOUT		msecs_to_jiffies(10000)



#define L2CAP_A2MP_DEFAULT_MTU		670



/* L2CAP socket address */

struct sockaddr_l2 {

	sa_family_t	l2_family;
@@ -109,12 +107,6 @@ struct l2cap_conninfo { 
#define L2CAP_ECHO_RSP		0x09

#define L2CAP_INFO_REQ		0x0a

#define L2CAP_INFO_RSP		0x0b

#define L2CAP_CREATE_CHAN_REQ	0x0c

#define L2CAP_CREATE_CHAN_RSP	0x0d

#define L2CAP_MOVE_CHAN_REQ	0x0e

#define L2CAP_MOVE_CHAN_RSP	0x0f

#define L2CAP_MOVE_CHAN_CFM	0x10

#define L2CAP_MOVE_CHAN_CFM_RSP	0x11

#define L2CAP_CONN_PARAM_UPDATE_REQ	0x12

#define L2CAP_CONN_PARAM_UPDATE_RSP	0x13

#define L2CAP_LE_CONN_REQ	0x14
@@ -144,7 +136,6 @@ struct l2cap_conninfo { 
/* L2CAP fixed channels */

#define L2CAP_FC_SIG_BREDR	0x02

#define L2CAP_FC_CONNLESS	0x04

#define L2CAP_FC_A2MP		0x08

#define L2CAP_FC_ATT		0x10

#define L2CAP_FC_SIG_LE		0x20

#define L2CAP_FC_SMP_LE		0x40
@@ -267,7 +258,6 @@ struct l2cap_conn_rsp { 
/* channel identifier */

#define L2CAP_CID_SIGNALING	0x0001

#define L2CAP_CID_CONN_LESS	0x0002

#define L2CAP_CID_A2MP		0x0003

#define L2CAP_CID_ATT		0x0004

#define L2CAP_CID_LE_SIGNALING	0x0005

#define L2CAP_CID_SMP		0x0006
@@ -282,7 +272,6 @@ struct l2cap_conn_rsp { 
#define L2CAP_CR_BAD_PSM	0x0002

#define L2CAP_CR_SEC_BLOCK	0x0003

#define L2CAP_CR_NO_MEM		0x0004

#define L2CAP_CR_BAD_AMP	0x0005

#define L2CAP_CR_INVALID_SCID	0x0006

#define L2CAP_CR_SCID_IN_USE	0x0007
@@ -404,29 +393,6 @@ struct l2cap_info_rsp { 
	__u8        data[];

} __packed;



struct l2cap_create_chan_req {

	__le16      psm;

	__le16      scid;

	__u8        amp_id;

} __packed;



struct l2cap_create_chan_rsp {

	__le16      dcid;

	__le16      scid;

	__le16      result;

	__le16      status;

} __packed;



struct l2cap_move_chan_req {

	__le16      icid;

	__u8        dest_amp_id;

} __packed;



struct l2cap_move_chan_rsp {

	__le16      icid;

	__le16      result;

} __packed;



#define L2CAP_MR_SUCCESS	0x0000

#define L2CAP_MR_PEND		0x0001

#define L2CAP_MR_BAD_ID		0x0002
@@ -539,8 +505,6 @@ struct l2cap_seq_list { 


struct l2cap_chan {

	struct l2cap_conn	*conn;

	struct hci_conn		*hs_hcon;

	struct hci_chan		*hs_hchan;

	struct kref	kref;

	atomic_t	nesting;
@@ -591,12 +555,6 @@ struct l2cap_chan { 
	unsigned long	conn_state;

	unsigned long	flags;



	__u8		remote_amp_id;

	__u8		local_amp_id;

	__u8		move_id;

	__u8		move_state;

	__u8		move_role;



	__u16		next_tx_seq;

	__u16		expected_ack_seq;

	__u16		expected_tx_seq;

net/bluetooth/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -62,14 +62,6 @@ source "net/bluetooth/cmtp/Kconfig" 


source "net/bluetooth/hidp/Kconfig"



config BT_HS

	bool "Bluetooth High Speed (HS) features"

	depends on BT_BREDR

	help

	  Bluetooth High Speed includes support for off-loading

	  Bluetooth connections via 802.11 (wifi) physical layer

	  available with Bluetooth version 3.0 or later.



config BT_LE

	bool "Bluetooth Low Energy (LE) features"

	depends on BT

net/bluetooth/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ bluetooth-$(CONFIG_DEV_COREDUMP) += coredump.o 


bluetooth-$(CONFIG_BT_BREDR) += sco.o

bluetooth-$(CONFIG_BT_LE) += iso.o

bluetooth-$(CONFIG_BT_HS) += a2mp.o amp.o

bluetooth-$(CONFIG_BT_LEDS) += leds.o

bluetooth-$(CONFIG_BT_MSFTEXT) += msft.o

bluetooth-$(CONFIG_BT_AOSPEXT) += aosp.o

net/bluetooth/a2mp.c

deleted100644 → 0
+0 −1054

File deleted.

Preview size limit exceeded, changes collapsed.