kernel: Disable Bluetooth

We don't have any userspace tools for this and I think
that a firewall is unlikely to have any of those devices.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index e648877536569c0456f62d20bc3f241195df53b4..6043a9e8c1e1a33e8578d377cdc68306b3b27bb5 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -101,10 +101,8 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_CLONE_BACKWARDS=y
 
 #
-# Bluetooth device drivers
+# Network testing
 #
-# CONFIG_BT_HCIBTSDIO is not set
-# CONFIG_BT_MRVL_SDIO is not set
 # CONFIG_RFKILL_GPIO is not set
 
 #

diff --git a/kernel/config-generic b/kernel/config-generic
index cac2ebf60bc1f6fb556bf423aef02d2ba60b5c82..cefa8901504a4d5d8c6fa75d83cd6047a39cea18 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -1140,45 +1140,7 @@ CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
-CONFIG_BT=m
-CONFIG_BT_BREDR=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HS=y
-CONFIG_BT_LE=y
-CONFIG_BT_LEDS=y
-# CONFIG_BT_SELFTEST is not set
-# CONFIG_BT_DEBUGFS is not set
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_INTEL=m
-CONFIG_BT_BCM=m
-CONFIG_BT_RTL=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
-CONFIG_BT_HCIBTUSB_BCM=y
-CONFIG_BT_HCIBTUSB_RTL=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_AG6XX=y
-CONFIG_BT_HCIUART_MRVL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_ATH3K=m
-CONFIG_BT_WILINK=m
-CONFIG_BT_HCIRSI=m
+# CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=m
@@ -2276,7 +2238,6 @@ CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
-CONFIG_RSI_COEX=y
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 9779953c59540a3dfbff8751e2decaf29a464477..5e05e5f79f513e3286e703afda873d815b17e67b 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -487,10 +487,8 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 
 #
-# Bluetooth device drivers
+# Network testing
 #
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_MRVL_SDIO=m
 CONFIG_RFKILL_GPIO=m
 
 #

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index d534b8e3d07a1ef5da1129078b2a2f87d39c99ea..bf8fa9a6c534cb45a523e4ac2c66e5a2113b5a8b 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.19.12
-release    = 6
+release    = 7
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>