Thread (25 messages) read the whole thread 25 messages, 3 authors, 2020-05-26
STALE2258d

[net-next RFC PATCH 02/13] net: hsr: rename hsr directory to hsr-prp to introduce PRP

From: Murali Karicheri <hidden>
Date: 2020-05-06 16:32:15
Also in: lkml, netdev
Subsystem: networking [general], the rest · Maintainers: "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

As prp driver is expected to re-use code from HSR driver,
rename the directory to net/hsr-prp as a preparatory step.

Signed-off-by: Murali Karicheri <redacted>
---
 MAINTAINERS                         | 2 +-
 net/Kconfig                         | 2 +-
 net/Makefile                        | 2 +-
 net/{hsr => hsr-prp}/Kconfig        | 0
 net/{hsr => hsr-prp}/Makefile       | 0
 net/{hsr => hsr-prp}/hsr_debugfs.c  | 0
 net/{hsr => hsr-prp}/hsr_device.c   | 0
 net/{hsr => hsr-prp}/hsr_device.h   | 0
 net/{hsr => hsr-prp}/hsr_forward.c  | 0
 net/{hsr => hsr-prp}/hsr_forward.h  | 0
 net/{hsr => hsr-prp}/hsr_framereg.c | 0
 net/{hsr => hsr-prp}/hsr_framereg.h | 0
 net/{hsr => hsr-prp}/hsr_main.c     | 0
 net/{hsr => hsr-prp}/hsr_main.h     | 0
 net/{hsr => hsr-prp}/hsr_netlink.c  | 0
 net/{hsr => hsr-prp}/hsr_netlink.h  | 0
 net/{hsr => hsr-prp}/hsr_slave.c    | 0
 net/{hsr => hsr-prp}/hsr_slave.h    | 0
 18 files changed, 3 insertions(+), 3 deletions(-)
 rename net/{hsr => hsr-prp}/Kconfig (100%)
 rename net/{hsr => hsr-prp}/Makefile (100%)
 rename net/{hsr => hsr-prp}/hsr_debugfs.c (100%)
 rename net/{hsr => hsr-prp}/hsr_device.c (100%)
 rename net/{hsr => hsr-prp}/hsr_device.h (100%)
 rename net/{hsr => hsr-prp}/hsr_forward.c (100%)
 rename net/{hsr => hsr-prp}/hsr_forward.h (100%)
 rename net/{hsr => hsr-prp}/hsr_framereg.c (100%)
 rename net/{hsr => hsr-prp}/hsr_framereg.h (100%)
 rename net/{hsr => hsr-prp}/hsr_main.c (100%)
 rename net/{hsr => hsr-prp}/hsr_main.h (100%)
 rename net/{hsr => hsr-prp}/hsr_netlink.c (100%)
 rename net/{hsr => hsr-prp}/hsr_netlink.h (100%)
 rename net/{hsr => hsr-prp}/hsr_slave.c (100%)
 rename net/{hsr => hsr-prp}/hsr_slave.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index db7a6d462dff..94d357145f81 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7789,7 +7789,7 @@ F:	drivers/net/usb/hso.c
 HSR NETWORK PROTOCOL
 L:	netdev@vger.kernel.org
 S:	Orphan
-F:	net/hsr/
+F:	net/hsr-prp/
 
 HT16K33 LED CONTROLLER DRIVER
 M:	Robin van der Gracht <robin@protonic.nl>
diff --git a/net/Kconfig b/net/Kconfig
index c5ba2d180c43..20216973d25f 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -239,7 +239,7 @@ source "net/vmw_vsock/Kconfig"
 source "net/netlink/Kconfig"
 source "net/mpls/Kconfig"
 source "net/nsh/Kconfig"
-source "net/hsr/Kconfig"
+source "net/hsr-prp/Kconfig"
 source "net/switchdev/Kconfig"
 source "net/l3mdev/Kconfig"
 source "net/qrtr/Kconfig"
diff --git a/net/Makefile b/net/Makefile
index 4f1c6a44f2c3..cab7e4071f42 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -77,7 +77,7 @@ obj-$(CONFIG_OPENVSWITCH)	+= openvswitch/
 obj-$(CONFIG_VSOCKETS)	+= vmw_vsock/
 obj-$(CONFIG_MPLS)		+= mpls/
 obj-$(CONFIG_NET_NSH)		+= nsh/
-obj-$(CONFIG_HSR_PRP)		+= hsr/
+obj-$(CONFIG_HSR_PRP)		+= hsr-prp/
 ifneq ($(CONFIG_NET_SWITCHDEV),)
 obj-y				+= switchdev/
 endif
diff --git a/net/hsr/Kconfig b/net/hsr-prp/Kconfig
similarity index 100%
rename from net/hsr/Kconfig
rename to net/hsr-prp/Kconfig
diff --git a/net/hsr/Makefile b/net/hsr-prp/Makefile
similarity index 100%
rename from net/hsr/Makefile
rename to net/hsr-prp/Makefile
diff --git a/net/hsr/hsr_debugfs.c b/net/hsr-prp/hsr_debugfs.c
similarity index 100%
rename from net/hsr/hsr_debugfs.c
rename to net/hsr-prp/hsr_debugfs.c
diff --git a/net/hsr/hsr_device.c b/net/hsr-prp/hsr_device.c
similarity index 100%
rename from net/hsr/hsr_device.c
rename to net/hsr-prp/hsr_device.c
diff --git a/net/hsr/hsr_device.h b/net/hsr-prp/hsr_device.h
similarity index 100%
rename from net/hsr/hsr_device.h
rename to net/hsr-prp/hsr_device.h
diff --git a/net/hsr/hsr_forward.c b/net/hsr-prp/hsr_forward.c
similarity index 100%
rename from net/hsr/hsr_forward.c
rename to net/hsr-prp/hsr_forward.c
diff --git a/net/hsr/hsr_forward.h b/net/hsr-prp/hsr_forward.h
similarity index 100%
rename from net/hsr/hsr_forward.h
rename to net/hsr-prp/hsr_forward.h
diff --git a/net/hsr/hsr_framereg.c b/net/hsr-prp/hsr_framereg.c
similarity index 100%
rename from net/hsr/hsr_framereg.c
rename to net/hsr-prp/hsr_framereg.c
diff --git a/net/hsr/hsr_framereg.h b/net/hsr-prp/hsr_framereg.h
similarity index 100%
rename from net/hsr/hsr_framereg.h
rename to net/hsr-prp/hsr_framereg.h
diff --git a/net/hsr/hsr_main.c b/net/hsr-prp/hsr_main.c
similarity index 100%
rename from net/hsr/hsr_main.c
rename to net/hsr-prp/hsr_main.c
diff --git a/net/hsr/hsr_main.h b/net/hsr-prp/hsr_main.h
similarity index 100%
rename from net/hsr/hsr_main.h
rename to net/hsr-prp/hsr_main.h
diff --git a/net/hsr/hsr_netlink.c b/net/hsr-prp/hsr_netlink.c
similarity index 100%
rename from net/hsr/hsr_netlink.c
rename to net/hsr-prp/hsr_netlink.c
diff --git a/net/hsr/hsr_netlink.h b/net/hsr-prp/hsr_netlink.h
similarity index 100%
rename from net/hsr/hsr_netlink.h
rename to net/hsr-prp/hsr_netlink.h
diff --git a/net/hsr/hsr_slave.c b/net/hsr-prp/hsr_slave.c
similarity index 100%
rename from net/hsr/hsr_slave.c
rename to net/hsr-prp/hsr_slave.c
diff --git a/net/hsr/hsr_slave.h b/net/hsr-prp/hsr_slave.h
similarity index 100%
rename from net/hsr/hsr_slave.h
rename to net/hsr-prp/hsr_slave.h
-- 
2.17.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help