[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20171112200214.10762-1-sthemmin@microsoft.com>
Date: Sun, 12 Nov 2017 12:02:14 -0800
From: Stephen Hemminger <stephen@...workplumber.org>
To: davem@...emloft.net
Cc: devel@...verdev.osuosl.org, netdev@...r.kernel.org,
Stephen Hemminger <sthemmin@...rosoft.com>,
Stephen Hemminger <stephen@...workplumber.org>
Subject: [PATCH net-next] decnet: move to staging
Support for Decnet has been orphaned for many years.
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 <stephen@...workplumber.org>
---
MAINTAINERS | 2 +-
drivers/staging/Kconfig | 5 +++++
drivers/staging/Makefile | 1 +
{net => drivers/staging}/decnet/Kconfig | 0
{net => drivers/staging}/decnet/Makefile | 0
{net => drivers/staging}/decnet/README | 0
{net => drivers/staging}/decnet/TODO | 0
{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
{net => drivers/staging}/decnet/netfilter/Kconfig | 0
{net => drivers/staging}/decnet/netfilter/Makefile | 0
{net => drivers/staging}/decnet/netfilter/dn_rtmsg.c | 0
{net => drivers/staging}/decnet/sysctl_net_decnet.c | 0
net/Kconfig | 2 --
net/Makefile | 1 -
23 files changed, 7 insertions(+), 4 deletions(-)
rename {net => drivers/staging}/decnet/Kconfig (100%)
rename {net => drivers/staging}/decnet/Makefile (100%)
rename {net => drivers/staging}/decnet/README (100%)
rename {net => drivers/staging}/decnet/TODO (100%)
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 {net => drivers/staging}/decnet/netfilter/Kconfig (100%)
rename {net => drivers/staging}/decnet/netfilter/Makefile (100%)
rename {net => drivers/staging}/decnet/netfilter/dn_rtmsg.c (100%)
rename {net => drivers/staging}/decnet/sysctl_net_decnet.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 29aa89a1837b..66e2d302d9eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3968,7 +3968,7 @@ W: http://linux-decnet.sourceforge.net
L: linux-decnet-user@...ts.sourceforge.net
S: Orphan
F: Documentation/networking/decnet.txt
-F: net/decnet/
+F: drivers/staging/decnet/
DECSTATION PLATFORM SUPPORT
M: "Maciej W. Rozycki" <macro@...ux-mips.org>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 554683912cff..e30af73c3797 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 6e536020029a..89655cc80a91 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/
diff --git a/net/decnet/Kconfig b/drivers/staging/decnet/Kconfig
similarity index 100%
rename from net/decnet/Kconfig
rename to drivers/staging/decnet/Kconfig
diff --git a/net/decnet/Makefile b/drivers/staging/decnet/Makefile
similarity index 100%
rename from net/decnet/Makefile
rename to drivers/staging/decnet/Makefile
diff --git a/net/decnet/README b/drivers/staging/decnet/README
similarity index 100%
rename from net/decnet/README
rename to drivers/staging/decnet/README
diff --git a/net/decnet/TODO b/drivers/staging/decnet/TODO
similarity index 100%
rename from net/decnet/TODO
rename to drivers/staging/decnet/TODO
diff --git a/net/decnet/af_decnet.c b/drivers/staging/decnet/af_decnet.c
similarity index 100%
rename from net/decnet/af_decnet.c
rename to drivers/staging/decnet/af_decnet.c
diff --git a/net/decnet/dn_dev.c b/drivers/staging/decnet/dn_dev.c
similarity index 100%
rename from net/decnet/dn_dev.c
rename to drivers/staging/decnet/dn_dev.c
diff --git a/net/decnet/dn_fib.c b/drivers/staging/decnet/dn_fib.c
similarity index 100%
rename from net/decnet/dn_fib.c
rename to drivers/staging/decnet/dn_fib.c
diff --git a/net/decnet/dn_neigh.c b/drivers/staging/decnet/dn_neigh.c
similarity index 100%
rename from net/decnet/dn_neigh.c
rename to drivers/staging/decnet/dn_neigh.c
diff --git a/net/decnet/dn_nsp_in.c b/drivers/staging/decnet/dn_nsp_in.c
similarity index 100%
rename from net/decnet/dn_nsp_in.c
rename to drivers/staging/decnet/dn_nsp_in.c
diff --git a/net/decnet/dn_nsp_out.c b/drivers/staging/decnet/dn_nsp_out.c
similarity index 100%
rename from net/decnet/dn_nsp_out.c
rename to drivers/staging/decnet/dn_nsp_out.c
diff --git a/net/decnet/dn_route.c b/drivers/staging/decnet/dn_route.c
similarity index 100%
rename from net/decnet/dn_route.c
rename to drivers/staging/decnet/dn_route.c
diff --git a/net/decnet/dn_rules.c b/drivers/staging/decnet/dn_rules.c
similarity index 100%
rename from net/decnet/dn_rules.c
rename to drivers/staging/decnet/dn_rules.c
diff --git a/net/decnet/dn_table.c b/drivers/staging/decnet/dn_table.c
similarity index 100%
rename from net/decnet/dn_table.c
rename to drivers/staging/decnet/dn_table.c
diff --git a/net/decnet/dn_timer.c b/drivers/staging/decnet/dn_timer.c
similarity index 100%
rename from net/decnet/dn_timer.c
rename to drivers/staging/decnet/dn_timer.c
diff --git a/net/decnet/netfilter/Kconfig b/drivers/staging/decnet/netfilter/Kconfig
similarity index 100%
rename from net/decnet/netfilter/Kconfig
rename to drivers/staging/decnet/netfilter/Kconfig
diff --git a/net/decnet/netfilter/Makefile b/drivers/staging/decnet/netfilter/Makefile
similarity index 100%
rename from net/decnet/netfilter/Makefile
rename to drivers/staging/decnet/netfilter/Makefile
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/drivers/staging/decnet/netfilter/dn_rtmsg.c
similarity index 100%
rename from net/decnet/netfilter/dn_rtmsg.c
rename to drivers/staging/decnet/netfilter/dn_rtmsg.c
diff --git a/net/decnet/sysctl_net_decnet.c b/drivers/staging/decnet/sysctl_net_decnet.c
similarity index 100%
rename from net/decnet/sysctl_net_decnet.c
rename to drivers/staging/decnet/sysctl_net_decnet.c
diff --git a/net/Kconfig b/net/Kconfig
index 9dba2715919d..38c873f20d5a 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -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"
diff --git a/net/Makefile b/net/Makefile
index 14fede520840..20b27479c907 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -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/
--
2.11.0
Powered by blists - more mailing lists