mirror
/
openwrt-routing
mirror of https://git.openwrt.org/feed/routing.git
1
0
Fork 0
Code Releases Activity

batman-adv: 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>
This commit is contained in:
Sven Eckelmann 2018-10-14 16:40:43 +02:00
parent 0db66160aa
commit 6a25fd5ce5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
batman-adv/Config.in
View File

@ -19,7 +19,7 @@
# B.A.T.M.A.N meshing protocol # B.A.T.M.A.N meshing protocol
# #
config KMOD_BATMAN_ADV_BATMAN_V config BATMAN_ADV_BATMAN_V
bool "B.A.T.M.A.N. V protocol" bool "B.A.T.M.A.N. V protocol"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
default y default y
@ -33,7 +33,7 @@ config KMOD_BATMAN_ADV_BATMAN_V
B.A.T.M.A.N. V is currently considered experimental and not B.A.T.M.A.N. V is currently considered experimental and not
compatible to B.A.T.M.A.N. IV networks. compatible to B.A.T.M.A.N. IV networks.
config KMOD_BATMAN_ADV_BLA config BATMAN_ADV_BLA
bool "Bridge Loop Avoidance" bool "Bridge Loop Avoidance"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
select PACKAGE_kmod-lib-crc16 select PACKAGE_kmod-lib-crc16
@ -45,7 +45,7 @@ config KMOD_BATMAN_ADV_BLA
more than one mesh node in the same LAN, you can safely remove more than one mesh node in the same LAN, you can safely remove
this feature and save some space. this feature and save some space.
config KMOD_BATMAN_ADV_DAT config BATMAN_ADV_DAT
bool "Distributed ARP Table" bool "Distributed ARP Table"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
default y default y
@ -55,7 +55,7 @@ config KMOD_BATMAN_ADV_DAT
mesh networks. If you think that your network does not need mesh networks. If you think that your network does not need
this option you can safely remove it and save some space. this option you can safely remove it and save some space.
config KMOD_BATMAN_ADV_NC config BATMAN_ADV_NC
bool "Network Coding" bool "Network Coding"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
help help
@ -68,7 +68,7 @@ config KMOD_BATMAN_ADV_NC
If you think that your network does not need this feature you If you think that your network does not need this feature you
can safely disable it and save some space. can safely disable it and save some space.
config KMOD_BATMAN_ADV_MCAST config BATMAN_ADV_MCAST
bool "Multicast optimisation" bool "Multicast optimisation"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
help help
@ -76,7 +76,7 @@ config KMOD_BATMAN_ADV_MCAST
reduce the air overhead while improving the reliability of reduce the air overhead while improving the reliability of
multicast messages. multicast messages.
config KMOD_BATMAN_ADV_DEBUGFS config BATMAN_ADV_DEBUGFS
bool "batman-adv debugfs entries" bool "batman-adv debugfs entries"
depends on PACKAGE_kmod-batman-adv depends on PACKAGE_kmod-batman-adv
select KERNEL_DEBUG_FS select KERNEL_DEBUG_FS
@ -87,9 +87,9 @@ config KMOD_BATMAN_ADV_DEBUGFS
If unsure, say N. If unsure, say N.
config KMOD_BATMAN_ADV_DEBUG_LOG config BATMAN_ADV_DEBUG
bool "B.A.T.M.A.N. debugging" bool "B.A.T.M.A.N. debugging"
depends on KMOD_BATMAN_ADV_DEBUGFS depends on BATMAN_ADV_DEBUGFS
help help
This is an option for use by developers; most people should This is an option for use by developers; most people should
say N here. This enables compilation of support for say N here. This enables compilation of support for

20
batman-adv/Makefile
View File

@ -52,13 +52,13 @@ endef
PKG_EXTRA_KCONFIG:= \ PKG_EXTRA_KCONFIG:= \
CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV=m \
CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG),y,n) \ CONFIG_BATMAN_ADV_DEBUG=$(if $(CONFIG_BATMAN_ADV_DEBUG),y,n) \
CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_KMOD_BATMAN_ADV_DEBUGFS),y,n) \ CONFIG_BATMAN_ADV_DEBUGFS=$(if $(CONFIG_BATMAN_ADV_DEBUGFS),y,n) \
CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_KMOD_BATMAN_ADV_BLA),y,n) \ CONFIG_BATMAN_ADV_BLA=$(if $(CONFIG_BATMAN_ADV_BLA),y,n) \
CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_KMOD_BATMAN_ADV_DAT),y,n) \ CONFIG_BATMAN_ADV_DAT=$(if $(CONFIG_BATMAN_ADV_DAT),y,n) \
CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),y,n) \ CONFIG_BATMAN_ADV_MCAST=$(if $(CONFIG_BATMAN_ADV_MCAST),y,n) \
CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_NC),y,n) \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_BATMAN_ADV_NC),y,n) \
CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_KMOD_BATMAN_ADV_BATMAN_V),y,n) \ CONFIG_BATMAN_ADV_BATMAN_V=$(if $(CONFIG_BATMAN_ADV_BATMAN_V),y,n) \
PKG_EXTRA_CFLAGS:= \ PKG_EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
@ -76,9 +76,9 @@ NOSTDINC_FLAGS = \
-DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)-$(PKG_RELEASE)\\\" -DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)-$(PKG_RELEASE)\\\"
COMPAT_SOURCES = \ COMPAT_SOURCES = \
$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ $(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \
$(if $(CONFIG_KMOD_BATMAN_ADV_MCAST),../../compat-sources/net/ipv4/igmp.o,) \ $(if $(CONFIG_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_MCAST),../../compat-sources/net/ipv6/mcast_snoop.o,) \
define Build/Compile define Build/Compile
+env "batman-adv-y=$(COMPAT_SOURCES)" \ +env "batman-adv-y=$(COMPAT_SOURCES)" \