net: move decnet to staging

PATCH In review Stephen Hemminger 3 participants 4 messages Nov 13, 2017 – Nov 14, 2017

Subsystems (4)

Networking Network drivers Staging netfilter

lore

Share & tools

lore

Stephen Hemminger

author

2017-11-13 17:11 UTC #0 lore raw

PATCH v2 1/1 net: move decnet to staging

Support for Decnet has been orphaned for some time.
In the interest of reducing the potential bug surface and pre-holiday cleaning, move the decnet protocol into staging for eventual removal.

Signed-off-by Stephen Hemminger <[email protected]>

---
Note original submission was hour or so before net-next closed. Not sure if you want to wait on this until after 4.15-rc1

v2 - update TODO and move include/net/dn.h to staging as well

 MAINTAINERS                                        |  2 +-
 drivers/staging/Kconfig                            |  5 +++
 drivers/staging/Makefile                           |  1 +
 {net => drivers/staging}/decnet/Kconfig            |  0
 {net => drivers/staging}/decnet/Makefile           |  3 +-
 {net => drivers/staging}/decnet/README             |  0
 drivers/staging/decnet/TODO                        |  4 +++
 {net => drivers/staging}/decnet/af_decnet.c        |  0
 {net => drivers/staging}/decnet/dn_dev.c           |  0
 {net => drivers/staging}/decnet/dn_fib.c           |  0
 {net => drivers/staging}/decnet/dn_neigh.c         |  0
 {net => drivers/staging}/decnet/dn_nsp_in.c        |  0
 {net => drivers/staging}/decnet/dn_nsp_out.c       |  0
 {net => drivers/staging}/decnet/dn_route.c         |  0
 {net => drivers/staging}/decnet/dn_rules.c         |  0
 {net => drivers/staging}/decnet/dn_table.c         |  0
 {net => drivers/staging}/decnet/dn_timer.c         |  0
 .../staging/decnet/include}/net/dn.h               |  0
 {net => drivers/staging}/decnet/netfilter/Kconfig  |  0
 {net => drivers/staging}/decnet/netfilter/Makefile |  3 +-
 .../staging}/decnet/netfilter/dn_rtmsg.c           |  0
 .../staging}/decnet/sysctl_net_decnet.c            |  0
 net/Kconfig                                        |  2 --
 net/Makefile                                       |  1 -
 net/decnet/TODO                                    | 41 ----------------------
 25 files changed, 15 insertions(+), 47 deletions(-)
 rename {net => drivers/staging}/decnet/Kconfig (100%)
 rename {net => drivers/staging}/decnet/Makefile (84%)
 rename {net => drivers/staging}/decnet/README (100%)
 create mode 100644 drivers/staging/decnet/TODO
 rename {net => drivers/staging}/decnet/af_decnet.c (100%)
 rename {net => drivers/staging}/decnet/dn_dev.c (100%)
 rename {net => drivers/staging}/decnet/dn_fib.c (100%)
 rename {net => drivers/staging}/decnet/dn_neigh.c (100%)
 rename {net => drivers/staging}/decnet/dn_nsp_in.c (100%)
 rename {net => drivers/staging}/decnet/dn_nsp_out.c (100%)
 rename {net => drivers/staging}/decnet/dn_route.c (100%)
 rename {net => drivers/staging}/decnet/dn_rules.c (100%)
 rename {net => drivers/staging}/decnet/dn_table.c (100%)
 rename {net => drivers/staging}/decnet/dn_timer.c (100%)
 rename {include => drivers/staging/decnet/include}/net/dn.h (100%)
 rename {net => drivers/staging}/decnet/netfilter/Kconfig (100%)
 rename {net => drivers/staging}/decnet/netfilter/Makefile (62%)
 rename {net => drivers/staging}/decnet/netfilter/dn_rtmsg.c (100%)
 rename {net => drivers/staging}/decnet/sysctl_net_decnet.c (100%)
 delete mode 100644 net/decnet/TODO

MAINTAINERS +1 -1

index 29aa89a1837b..66e2d302d9eb 100644
@@ -3968,7 +3968,7 @@ W:	http://linux-decnet.sourceforge.net
 L:	[email protected]
 S:	Orphan
 F:	Documentation/networking/decnet.txt
-F:	net/decnet/
+F:	drivers/staging/decnet/
 
 DECSTATION PLATFORM SUPPORT
 M:	"Maciej W. Rozycki" <[email protected]>

drivers/staging/Kconfig +5 -0

index 554683912cff..e30af73c3797 100644
@@ -30,6 +30,11 @@ source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/comedi/Kconfig"
 
+if NETFILTER
+source "drivers/staging/decnet/netfilter/Kconfig"
+endif
+source "drivers/staging/decnet/Kconfig"
+
 source "drivers/staging/olpc_dcon/Kconfig"
 
 source "drivers/staging/rtl8192u/Kconfig"

drivers/staging/Makefile +1 -0

index 6e536020029a..89655cc80a91 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_IRDA)		+= irda/net/
 obj-$(CONFIG_IRDA)		+= irda/drivers/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
 obj-$(CONFIG_COMEDI)		+= comedi/
+obj-$(CONFIG_DECNET)		+= decnet/
 obj-$(CONFIG_FB_OLPC_DCON)	+= olpc_dcon/
 obj-$(CONFIG_RTL8192U)		+= rtl8192u/
 obj-$(CONFIG_RTL8192E)		+= rtl8192e/

drivers/staging/decnet/Kconfig renamed from net/decnet/Kconfig +0 -0

similarity index 100%
rename from net/decnet/Kconfig
rename to drivers/staging/decnet/Kconfig

drivers/staging/decnet/Makefile renamed from net/decnet/Makefile +2 -1

similarity index 84%
rename from net/decnet/Makefile
rename to drivers/staging/decnet/Makefile
index 9e38122d942b..bda16fefbef2 100644
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
+ccflags-y := -I$(srctree)/drivers/staging/decnet/include
+
 obj-$(CONFIG_DECNET) += decnet.o
 
 decnet-y := af_decnet.o dn_nsp_in.o dn_nsp_out.o \

@@ -8,4 +10,3 @@ decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
 decnet-y += sysctl_net_decnet.o
 
 obj-$(CONFIG_NETFILTER) += netfilter/
-

drivers/staging/decnet/README renamed from net/decnet/README +0 -0

similarity index 100%
rename from net/decnet/README
rename to drivers/staging/decnet/README

drivers/staging/decnet/TODO new file +4 -0

new file mode 100644
index 000000000000..a0ec2e444885
@@ -0,0 +1,4 @@
+The DecNet code will be removed soon from the kernel tree as it is old,
+obsolete, and buggy.
+
+Don't worry about fixing up anything here, it's not needed.

drivers/staging/decnet/af_decnet.c renamed from net/decnet/af_decnet.c +0 -0

similarity index 100%
rename from net/decnet/af_decnet.c
rename to drivers/staging/decnet/af_decnet.c

drivers/staging/decnet/dn_dev.c renamed from net/decnet/dn_dev.c +0 -0

similarity index 100%
rename from net/decnet/dn_dev.c
rename to drivers/staging/decnet/dn_dev.c

drivers/staging/decnet/dn_fib.c renamed from net/decnet/dn_fib.c +0 -0

similarity index 100%
rename from net/decnet/dn_fib.c
rename to drivers/staging/decnet/dn_fib.c

drivers/staging/decnet/dn_neigh.c renamed from net/decnet/dn_neigh.c +0 -0

similarity index 100%
rename from net/decnet/dn_neigh.c
rename to drivers/staging/decnet/dn_neigh.c

drivers/staging/decnet/dn_nsp_in.c renamed from net/decnet/dn_nsp_in.c +0 -0

similarity index 100%
rename from net/decnet/dn_nsp_in.c
rename to drivers/staging/decnet/dn_nsp_in.c

drivers/staging/decnet/dn_nsp_out.c renamed from net/decnet/dn_nsp_out.c +0 -0

similarity index 100%
rename from net/decnet/dn_nsp_out.c
rename to drivers/staging/decnet/dn_nsp_out.c

drivers/staging/decnet/dn_route.c renamed from net/decnet/dn_route.c +0 -0

similarity index 100%
rename from net/decnet/dn_route.c
rename to drivers/staging/decnet/dn_route.c

drivers/staging/decnet/dn_rules.c renamed from net/decnet/dn_rules.c +0 -0

similarity index 100%
rename from net/decnet/dn_rules.c
rename to drivers/staging/decnet/dn_rules.c

drivers/staging/decnet/dn_table.c renamed from net/decnet/dn_table.c +0 -0

similarity index 100%
rename from net/decnet/dn_table.c
rename to drivers/staging/decnet/dn_table.c

drivers/staging/decnet/dn_timer.c renamed from net/decnet/dn_timer.c +0 -0

similarity index 100%
rename from net/decnet/dn_timer.c
rename to drivers/staging/decnet/dn_timer.c

drivers/staging/decnet/include/net/dn.h renamed from include/net/dn.h +0 -0

similarity index 100%
rename from include/net/dn.h
rename to drivers/staging/decnet/include/net/dn.h

drivers/staging/decnet/netfilter/Kconfig renamed from net/decnet/netfilter/Kconfig +0 -0

similarity index 100%
rename from net/decnet/netfilter/Kconfig
rename to drivers/staging/decnet/netfilter/Kconfig

drivers/staging/decnet/netfilter/Makefile renamed from net/decnet/netfilter/Makefile +2 -1

similarity index 62%
rename from net/decnet/netfilter/Makefile
rename to drivers/staging/decnet/netfilter/Makefile
index 255c1ae9daeb..d3478f8b29d8 100644
@@ -2,5 +2,6 @@
 # Makefile for DECnet netfilter modules
 #
 
-obj-$(CONFIG_DECNET_NF_GRABULATOR) += dn_rtmsg.o
+ccflags-y := -I$(srctree)/drivers/staging/decnet/include
 
+obj-$(CONFIG_DECNET_NF_GRABULATOR) += dn_rtmsg.o

drivers/staging/decnet/netfilter/dn_rtmsg.c renamed from net/decnet/netfilter/dn_rtmsg.c +0 -0

similarity index 100%
rename from net/decnet/netfilter/dn_rtmsg.c
rename to drivers/staging/decnet/netfilter/dn_rtmsg.c

drivers/staging/decnet/sysctl_net_decnet.c renamed from net/decnet/sysctl_net_decnet.c +0 -0

similarity index 100%
rename from net/decnet/sysctl_net_decnet.c
rename to drivers/staging/decnet/sysctl_net_decnet.c

net/Kconfig +0 -2

index 9dba2715919d..38c873f20d5a 100644
@@ -195,7 +195,6 @@ config BRIDGE_NETFILTER
 source "net/netfilter/Kconfig"
 source "net/ipv4/netfilter/Kconfig"
 source "net/ipv6/netfilter/Kconfig"
-source "net/decnet/netfilter/Kconfig"
 source "net/bridge/netfilter/Kconfig"
 
 endif

@@ -210,7 +209,6 @@ source "net/802/Kconfig"
 source "net/bridge/Kconfig"
 source "net/dsa/Kconfig"
 source "net/8021q/Kconfig"
-source "net/decnet/Kconfig"
 source "net/llc/Kconfig"
 source "net/ipx/Kconfig"
 source "drivers/net/appletalk/Kconfig"

net/Makefile +0 -1

index 14fede520840..20b27479c907 100644
@@ -39,7 +39,6 @@ obj-$(CONFIG_AF_KCM)		+= kcm/
 obj-$(CONFIG_STREAM_PARSER)	+= strparser/
 obj-$(CONFIG_ATM)		+= atm/
 obj-$(CONFIG_L2TP)		+= l2tp/
-obj-$(CONFIG_DECNET)		+= decnet/
 obj-$(CONFIG_PHONET)		+= phonet/
 ifneq ($(CONFIG_VLAN_8021Q),)
 obj-y				+= 8021q/

net/decnet/TODO deleted +0 ~~-41~~

41 lines not on this page · raw message

Signature · 1 line

2.11.0

Joe Perches

2017-11-13 19:32 UTC #1 lore raw

Quoted 3 lines · Stephen Hemminger

Support for Decnet has been orphaned for some time.
In the interest of reducing the potential bug surface and pre-holiday cleaning, move the decnet protocol into staging for eventual removal.

[]

drivers/staging/decnet/TODO

Quoted 1 line

drivers/staging/decnet/TODO +0 -0

[]

drivers/staging/decnet/TODO line 2

Quoted 3 lines

drivers/staging/decnet/TODO +2 -0

@@ -0,0 +1,4 @@
+The DecNet code will be removed soon from the kernel tree as it is old,
+obsolete, and buggy.

Old and obsolete, well OK, but
what's buggy about decnet?

https://bugzilla.kernel.org/buglist.cgi?quicksearch=decnet

Zarro Boogs found.

Eric Dumazet

2017-11-13 20:25 UTC #2 lore raw

Quoted 14 lines · Joe Perches

Quoted 3 lines · Stephen Hemminger
Support for Decnet has been orphaned for some time.
In the interest of reducing the potential bug surface and pre-holiday cleaning, move the decnet protocol into staging for eventual removal.
[]
drivers/staging/decnet/TODO
Quoted 1 line
drivers/staging/decnet/TODO +0 -0
[]
drivers/staging/decnet/TODO line 2
Quoted 3 lines
drivers/staging/decnet/TODO +2 -0
@@ -0,0 +1,4 @@
+The DecNet code will be removed soon from the kernel tree as it is old,
+obsolete, and buggy.
Old and obsolete, well OK, but
what's buggy about decnet?

Quoted 4 lines

https://bugzilla.kernel.org/buglist.cgi?quicksearch=decnet
Zarro Boogs found.

Then that means nobody uses it.

And that syzkaller guys never bothered to add code to actually trigger the bugs that are probably there. Probably they have bigger fishes to fry at this moment.

If we leave the code there, chances are high that some hacker is interested into exploiting the bugs.

Joe Perches

2017-11-14 15:07 UTC #3 lore raw

Quoted 17 lines · Eric Dumazet

Quoted 16 lines · Joe Perches
Quoted 3 lines · Stephen Hemminger
Support for Decnet has been orphaned for some time.
In the interest of reducing the potential bug surface and pre-holiday cleaning, move the decnet protocol into staging for eventual removal.
[]
drivers/staging/decnet/TODO
Quoted 1 line
drivers/staging/decnet/TODO +0 -0
[]
drivers/staging/decnet/TODO line 2
Quoted 3 lines
drivers/staging/decnet/TODO +2 -0
@@ -0,0 +1,4 @@
+The DecNet code will be removed soon from the kernel tree as it is old,
+obsolete, and buggy.
Old and obsolete, well OK, but
what's buggy about decnet?

Quoted 6 lines

Quoted 4 lines
https://bugzilla.kernel.org/buglist.cgi?quicksearch=decnet
Zarro Boogs found.
Then that means nobody uses it.

No, it doesn't mean that.

Quoted 3 lines

And that syzkaller guys never bothered to add code to actually trigger the bugs that are probably there. Probably they have bigger fishes to fry at this moment.

It may mean that.

Quoted 2 lines

If we leave the code there, chances are high that some hacker is interested into exploiting the bugs.

linux isn't bsd.
The code is there already.