The following commit has been merged in the merge/master branch: commit e01abefce143a2d3f99695e5e66d6155d9799ed3 Author: Antonio Quartulli antonio@meshcoding.com Date: Sat Mar 22 09:17:22 2014 +0100

batman-adv: fix MCAST Kconfig option

Signed-off-by: Antonio Quartulli antonio@meshcoding.com

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index d8ee74c..11660a3 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -52,6 +52,7 @@ config BATMAN_ADV_NC

config BATMAN_ADV_MCAST bool "Multicast optimisation" + depends on BATMAN_ADV default n help This option enables the multicast optimisation which aims to