On Wed, Apr 24, 2019 at 4:37 AM David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> From: Arnd Bergmann <arnd@xxxxxxxx>
> Date: Tue, 23 Apr 2019 17:11:32 +0200
>
> > When isdn4linux came up in the context of another patch series, I
> > remembered that we had discussed removing it a while ago.
>
> This seems long overdue to me.
>
> Could you please respin against net-next and I'll just apply this?
Ok. I'll send a pull request then, which should make it easier to deal with
the file removals, as I'm never sure whether 'git format-patch -D' patches
make it across the list correctly, at least I had problems applying them
in the past.
I added a few fixups as in the diff below in the meantime, to deal
with build regressions from the last patch. In particular, the BT_CMTP
(CIP) code also needs to be moved into staging along with the CAPI
core. From what I can find, this was originally used for dial-up
internet connections with 'Bluefritz' ISDN hardware, but it stopped
working many years ago and is no longer useful with after the
public network shutdown either.
Arnd
diff --git a/drivers/staging/isdn/Kconfig b/drivers/staging/isdn/Kconfig
index 77e1b80af716..29d13fcd9e2b 100644
--- a/drivers/staging/isdn/Kconfig
+++ b/drivers/staging/isdn/Kconfig
@@ -1,5 +1,6 @@
menuconfig ISDN_CAPI
tristate "CAPI 2.0 subsystem"
+ depends on NET && NETDEVICES
help
This provides CAPI (the Common ISDN Application Programming
Interface) Version 2.0, a standard making it easy for programs to
@@ -23,6 +24,7 @@ source "drivers/staging/isdn/gigaset/Kconfig"
source "drivers/staging/isdn/hysdn/Kconfig"
+source "drivers/staging/isdn/cmtp/Kconfig"
endif # ISDN_CAPI
diff --git a/drivers/staging/isdn/Makefile b/drivers/staging/isdn/Makefile
index c5e8b8004f65..a74e9163f3c8 100644
--- a/drivers/staging/isdn/Makefile
+++ b/drivers/staging/isdn/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_ISDN_CAPI) += capi/
obj-$(CONFIG_CAPI_AVM) += avm/
obj-$(CONFIG_HYSDN) += hysdn/
obj-$(CONFIG_ISDN_DRV_GIGASET) += gigaset/
+obj-$(CONFIG_BT_CMTP) += cmtp/
diff --git a/net/bluetooth/cmtp/Kconfig b/drivers/staging/isdn/cmtp/Kconfig
similarity index 88%
rename from net/bluetooth/cmtp/Kconfig
rename to drivers/staging/isdn/cmtp/Kconfig
index 939da0fbdd88..1772ca952720 100644
--- a/net/bluetooth/cmtp/Kconfig
+++ b/drivers/staging/isdn/cmtp/Kconfig
@@ -1,6 +1,6 @@
config BT_CMTP
tristate "CMTP protocol support"
- depends on BT_BREDR && ISDN_CAPI
+ depends on BT && BT_BREDR && ISDN_CAPI
help
CMTP (CAPI Message Transport Protocol) is a transport layer
for CAPI messages. CMTP is required for the Bluetooth Common
diff --git a/net/bluetooth/cmtp/Makefile b/drivers/staging/isdn/cmtp/Makefile
similarity index 59%
rename from net/bluetooth/cmtp/Makefile
rename to drivers/staging/isdn/cmtp/Makefile
index 890a9a5a6861..23258b46753c 100644
--- a/net/bluetooth/cmtp/Makefile
+++ b/drivers/staging/isdn/cmtp/Makefile
@@ -5,3 +5,5 @@
obj-$(CONFIG_BT_CMTP) += cmtp.o
cmtp-objs := core.o sock.o capi.o
+
+ccflags-y += -I$(srctree)/$(src)/../include -I$(srctree)/$(src)/../include/uapi
diff --git a/net/bluetooth/cmtp/capi.c b/drivers/staging/isdn/cmtp/capi.c
similarity index 100%
rename from net/bluetooth/cmtp/capi.c
rename to drivers/staging/isdn/cmtp/capi.c
diff --git a/net/bluetooth/cmtp/cmtp.h b/drivers/staging/isdn/cmtp/cmtp.h
similarity index 100%
rename from net/bluetooth/cmtp/cmtp.h
rename to drivers/staging/isdn/cmtp/cmtp.h
diff --git a/net/bluetooth/cmtp/core.c b/drivers/staging/isdn/cmtp/core.c
similarity index 100%
rename from net/bluetooth/cmtp/core.c
rename to drivers/staging/isdn/cmtp/core.c
diff --git a/net/bluetooth/cmtp/sock.c b/drivers/staging/isdn/cmtp/sock.c
similarity index 100%
rename from net/bluetooth/cmtp/sock.c
rename to drivers/staging/isdn/cmtp/sock.c
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index db82a40875e8..f3bfd9ec5e32 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -55,8 +55,6 @@ source "net/bluetooth/rfcomm/Kconfig"
source "net/bluetooth/bnep/Kconfig"
-source "net/bluetooth/cmtp/Kconfig"
-
source "net/bluetooth/hidp/Kconfig"
config BT_HS
diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index fda41c0b4781..7fdd758f0395 100644
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -6,7 +6,6 @@
obj-$(CONFIG_BT) += bluetooth.o
obj-$(CONFIG_BT_RFCOMM) += rfcomm/
obj-$(CONFIG_BT_BNEP) += bnep/
-obj-$(CONFIG_BT_CMTP) += cmtp/
obj-$(CONFIG_BT_HIDP) += hidp/
obj-$(CONFIG_BT_6LOWPAN) += bluetooth_6lowpan.o
