Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 846df98173e0315e4173b9da542633fa1cdb48d3 Author: Sven Eckelmann sven.eckelmann@open-mesh.com Date: Fri Sep 30 15:21:06 2016 +0200

batman-adv: Update wifi flags on upper link change

Things like VLANs don't have their link set when they are created. Thus the wifi flags have to be evaluated later to fix their contents for the link interface.

Signed-off-by: Sven Eckelmann sven.eckelmann@open-mesh.com Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

846df98173e0315e4173b9da542633fa1cdb48d3 compat-include/linux/netdevice.h | 2 ++ net/batman-adv/hard-interface.c | 5 +++++ 2 files changed, 7 insertions(+)

diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index fb5b519..e71e614 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -43,6 +43,8 @@

#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)

+#define NETDEV_CHANGEUPPER 0x0015 + #define netdev_notifier_info_to_dev(ptr) ptr

#endif /* < KERNEL_VERSION(3, 11, 0) */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index cd8146f..797d81f 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -1005,6 +1005,11 @@ static int batadv_hard_if_event(struct notifier_block *this, if (hard_iface == primary_if) batadv_primary_if_update_addr(bat_priv, NULL); break; + case NETDEV_CHANGEUPPER: + hard_iface->wifi_flags = batadv_wifi_flags_evaluate(net_dev); + if (batadv_is_wifi_hardif(hard_iface)) + hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS; + break; default: break; }