Skip to contentSkip to conversation

Bluetooth: Remove BT_HS

PATCH Superseded Luiz Augusto von Dentz 2 participants 2 messages Feb 1, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH v2 1/1 Bluetooth: Remove BT_HS

From: Luiz Augusto von Dentz <[email protected]>

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/

---
 include/net/bluetooth/hci.h   |    1 -
 include/net/bluetooth/l2cap.h |   42 --
 net/bluetooth/Kconfig         |    8 -
 net/bluetooth/Makefile        |    1 -
 net/bluetooth/a2mp.c          | 1054 ---------------------------------
 net/bluetooth/a2mp.h          |  154 -----
 net/bluetooth/amp.c           |  590 ------------------
 net/bluetooth/amp.h           |   60 --
 net/bluetooth/hci_conn.c      |    4 -
 net/bluetooth/hci_event.c     |    2 -
 net/bluetooth/l2cap_core.c    | 1016 +------------------------------
 net/bluetooth/l2cap_sock.c    |   18 +-
 net/bluetooth/mgmt.c          |   73 +--
 13 files changed, 20 insertions(+), 3003 deletions(-)
 delete mode 100644 net/bluetooth/a2mp.c
 delete mode 100644 net/bluetooth/a2mp.h
 delete mode 100644 net/bluetooth/amp.c
 delete mode 100644 net/bluetooth/amp.h
include/net/bluetooth/hci.h +0 -1
index 1cd212bb3789..aa6c69053d7c 100644
@@ -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

90 lines not on this page · raw message

net/bluetooth/Kconfig +0 -8
index da7cac0a1b71..6b2b65a66700 100644
@@ -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
index 141ac1fda0bf..628d448d78be 100644
@@ -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 deleted +0 -1054

1,054 lines not on this page · raw message

net/bluetooth/a2mp.h deleted +0 -154

154 lines not on this page · raw message

net/bluetooth/amp.c deleted +0 -590

590 lines not on this page · raw message

net/bluetooth/amp.h deleted +0 -60

60 lines not on this page · raw message

net/bluetooth/hci_conn.c +0 -4
index a41d2693f4d8..fc4d72f83ac2 100644
@@ -36,7 +36,6 @@
 
 #include "hci_request.h"
 #include "smp.h"
-#include "a2mp.h"
 #include "eir.h"
 
 struct sco_param {
@@ -1175,9 +1174,6 @@ void hci_conn_del(struct hci_conn *conn)
 		}
 	}
 
-	if (conn->amp_mgr)
-		amp_mgr_put(conn->amp_mgr);
-
 	skb_queue_purge(&conn->data_q);
 
 	/* Remove the connection from the list and cleanup its remaining
net/bluetooth/hci_event.c +0 -2
index 48ba9f9e0b74..db16c3aff397 100644
@@ -36,8 +36,6 @@
 #include "hci_request.h"
 #include "hci_debugfs.h"
 #include "hci_codec.h"
-#include "a2mp.h"
-#include "amp.h"
 #include "smp.h"
 #include "msft.h"
 #include "eir.h"
net/bluetooth/l2cap_core.c +18 -998

1,000 lines not on this page · raw message

net/bluetooth/l2cap_sock.c +1 -17
index e50d3d102078..ee7a41d6994f 100644

Lines of this file are not shown. View the raw message.

net/bluetooth/mgmt.c +1 -72

73 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.43.0

Part of the diff is not shown here. View the raw message.

#1 lore raw

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=822279

---Test result---

Test Summary:

CheckPatch                    FAIL      2.59 seconds
GitLint                       PASS      0.34 seconds
SubjectPrefix                 PASS      0.13 seconds
BuildKernel                   PASS      27.40 seconds
CheckAllWarning               WARNING   30.52 seconds
CheckSparse                   WARNING   35.62 seconds
CheckSmatch                   WARNING   98.34 seconds
BuildKernel32                 PASS      26.86 seconds
TestRunnerSetup               PASS      438.37 seconds
TestRunner_l2cap-tester       PASS      23.09 seconds
TestRunner_iso-tester         PASS      43.30 seconds
TestRunner_bnep-tester        PASS      6.88 seconds
TestRunner_mgmt-tester        FAIL      162.23 seconds
TestRunner_rfcomm-tester      PASS      10.73 seconds
TestRunner_sco-tester         PASS      14.52 seconds
TestRunner_ioctl-tester       PASS      12.23 seconds
TestRunner_mesh-tester        PASS      8.78 seconds
TestRunner_smp-tester         PASS      11.94 seconds
TestRunner_userchan-tester    PASS      7.32 seconds
IncrementalBuild              PASS      26.39 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v2] Bluetooth: Remove BT_HS
WARNING: Prefer a maximum 75 chars per line (possible unwrapped commit description?) #94:
https://www.bluetooth.com/blog/new-core-specification-v5-3-feature-enhancements/

WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #263:
deleted file mode 100644

total: 0 errors, 2 warnings, 0 checks, 1507 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13541814.patch has style problems, please review.

NOTE: Ignored message types: UNKNOWN_COMMIT_ID

NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.

##############################
Test: CheckAllWarning - WARNING
Desc: Run linux kernel with all warning enabled
Output:
net/bluetooth/l2cap_core.c:1224:13: warning: ‘l2cap_move_setup’ defined but not used [-Wunused-function] 1224 | static void l2cap_move_setup(struct l2cap_chan *chan) | ^~~~~~~~~~~~~~~~net/bluetooth/l2cap_core.c:168:27: warning: ‘l2cap_get_chan_by_ident’ defined but not used [-Wunused-function] 168 | static struct l2cap_chan *l2cap_get_chan_by_ident(struct l2cap_conn *conn, | ^~~~~~~~~~~~~~~~~~~~~~~
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):net/bluetooth/l2cap_core.c:1224:13: warning: ‘l2cap_move_setup’ defined but not used [-Wunused-function]net/bluetooth/l2cap_core.c:168:27: warning: ‘l2cap_get_chan_by_ident’ defined but not used [-Wunused-function]
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):net/bluetooth/l2cap_core.c:1224:13: warning: ‘l2cap_move_setup’ defined but not used [-Wunused-function]net/bluetooth/l2cap_core.c:168:27: warning: ‘l2cap_get_chan_by_ident’ defined but not used [-Wunused-function]
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 497, Passed: 486 (97.8%), Failed: 5, Not Run: 6

Failed Test Cases

Read Ext Controller Info 1                           Failed       0.166 seconds
Read Ext Controller Info 2                           Failed       0.193 seconds
Read Ext Controller Info 3                           Failed       0.184 seconds
Read Ext Controller Info 4                           Failed       0.179 seconds
Read Ext Controller Info 5                           Failed       0.206 seconds

---
Regards,
Linux Bluetooth