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

On branches: ecsv/master,master

commit 371632c5cbe4aaeba60e21c17630ce5b56569f56 Author: Sven Eckelmann sven@narfation.org Date: Sat Feb 11 21:15:07 2017 +0100

batman-adv-devel: Synchronize Kconfig entries with openwrt-routing

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

371632c5cbe4aaeba60e21c17630ce5b56569f56 batman-adv-devel/Config.in | 11 ++++++++--- batman-adv-devel/Makefile | 1 + 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/batman-adv-devel/Config.in b/batman-adv-devel/Config.in index 01f9e7e..2b42b7c 100644 --- a/batman-adv-devel/Config.in +++ b/batman-adv-devel/Config.in @@ -14,6 +14,11 @@ config KMOD_BATMAN_ADV_DEVEL_DAT depends on PACKAGE_kmod-batman-adv-devel default y

+config KMOD_BATMAN_ADV_DEVEL_DEBUGFS + bool "enable debugfs support" + depends on PACKAGE_kmod-batman-adv-devel + default y + config KMOD_BATMAN_ADV_DEVEL_MCAST bool "enable multicast transmission optimization" depends on PACKAGE_kmod-batman-adv-devel @@ -25,9 +30,9 @@ config KMOD_BATMAN_ADV_DEVEL_NC default n

config KMOD_BATMAN_ADV_DEVEL_BATMAN_V - bool "enable batman v routing algorithm" - depends on PACKAGE_kmod-batman-adv-devel - default n + bool "enable batman v routing algorithm" + depends on PACKAGE_kmod-batman-adv-devel + default y

config KMOD_BATMAN_ADV_DEVEL_BATMAN_BRANCH string diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 83da0cc..f7b4529 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -51,6 +51,7 @@ 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) \