Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch : master

commit 36d86d8f63d6413838aad79880291ac4246b1499 Author: Sven Eckelmann sven@narfation.org Date: Sun Oct 14 16:40:43 2018 +0200

batman-adv-devel: Use the kernel style Kconfig symbols

Kernel modules like ath9k and ath10k are using the same Kconfig option symbols as used in the kernel. This makes it easier to share them between these two projects. A similar approach should be used for the batman-adv module.

Signed-off-by: Sven Eckelmann sven@narfation.org

36d86d8f63d6413838aad79880291ac4246b1499 batman-adv-devel/Config.in | 16 ++++++++-------- batman-adv-devel/Makefile | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 6b4f89e..c0a6726 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -19,7 +19,7 @@ # B.A.T.M.A.N meshing protocol #

-config KMOD_BATMAN_ADV_DEVEL_BATMAN_V +config BATMAN_ADV_DEVEL_BATMAN_V bool "B.A.T.M.A.N. V protocol" depends on PACKAGE_kmod-batman-adv-devel default y @@ -33,7 +33,7 @@ config KMOD_BATMAN_ADV_DEVEL_BATMAN_V B.A.T.M.A.N. V is currently considered experimental and not compatible to B.A.T.M.A.N. IV networks.

-config KMOD_BATMAN_ADV_DEVEL_BLA +config BATMAN_ADV_DEVEL_BLA bool "Bridge Loop Avoidance" depends on PACKAGE_kmod-batman-adv-devel select PACKAGE_kmod-lib-crc16 @@ -45,7 +45,7 @@ config KMOD_BATMAN_ADV_DEVEL_BLA more than one mesh node in the same LAN, you can safely remove this feature and save some space.

-config KMOD_BATMAN_ADV_DEVEL_DAT +config BATMAN_ADV_DEVEL_DAT bool "Distributed ARP Table" depends on PACKAGE_kmod-batman-adv-devel default y @@ -55,7 +55,7 @@ config KMOD_BATMAN_ADV_DEVEL_DAT mesh networks. If you think that your network does not need this option you can safely remove it and save some space.

-config KMOD_BATMAN_ADV_DEVEL_NC +config BATMAN_ADV_DEVEL_NC bool "Network Coding" depends on PACKAGE_kmod-batman-adv-devel help @@ -68,7 +68,7 @@ config KMOD_BATMAN_ADV_DEVEL_NC If you think that your network does not need this feature you can safely disable it and save some space.

-config KMOD_BATMAN_ADV_DEVEL_MCAST +config BATMAN_ADV_DEVEL_MCAST bool "Multicast optimisation" depends on PACKAGE_kmod-batman-adv-devel help @@ -76,7 +76,7 @@ config KMOD_BATMAN_ADV_DEVEL_MCAST reduce the air overhead while improving the reliability of multicast messages.

-config KMOD_BATMAN_ADV_DEVEL_DEBUGFS +config BATMAN_ADV_DEVEL_DEBUGFS bool "batman-adv debugfs entries" depends on PACKAGE_kmod-batman-adv-devel select KERNEL_DEBUG_FS @@ -87,9 +87,9 @@ config KMOD_BATMAN_ADV_DEVEL_DEBUGFS

If unsure, say N.

-config KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG +config BATMAN_ADV_DEVEL_DEBUG bool "B.A.T.M.A.N. debugging" - depends on KMOD_BATMAN_ADV_DEVEL_DEBUGFS + depends on BATMAN_ADV_DEVEL_DEBUGFS help This is an option for use by developers; most people should say N here. This enables compilation of support for diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index eba6a36..c5af589 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -66,13 +66,13 @@ endef

PKG_EXTRA_KCONFIG:= \ CONFIG_BATMAN_ADV=m \ - CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG),y,n) \ - CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUGFS),y,n) \ - CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BLA),y,n) \ - CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_DAT),y,n) \ - CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_MCAST),y,n) \ - CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_NC),y,n) \ - CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \ + CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEVEL_DEBUG),y,n) \ + CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_BATMAN_ADV_DEVEL_DEBUGFS),y,n) \ + CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_DEVEL_BLA),y,n) \ + CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_BATMAN_ADV_DEVEL_DAT),y,n) \ + CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),y,n) \ + CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_DEVEL_NC),y,n) \ + CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_DEVEL_BATMAN_V),y,n) \

PKG_EXTRA_CFLAGS:= \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ @@ -90,9 +90,9 @@ NOSTDINC_FLAGS = \ -DBATADV_SOURCE_VERSION=\"openwrt-$(PKG_VERSION)\" \

COMPAT_SOURCES = \ - $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ - $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \ - $(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \ + $(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),../../compat-sources/net/core/skbuff.o,) \ + $(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),../../compat-sources/net/ipv4/igmp.o,) \ + $(if $(CONFIG_BATMAN_ADV_DEVEL_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \

define Build/Compile +env "batman-adv-y=$(COMPAT_SOURCES)" \