On Tuesday 10 May 2016 22:31:59 Marek Lindner wrote:
The ELP interval and throughput override interface settings are initialized with default settings on every time an interface is added to a mesh. This patch prevents this behavior by moving the configuration init to the interface detection routine which runs only once per interface.
Signed-off-by: Marek Lindner mareklindner@neomailbox.ch
[...]
index db2009d..dd6a5a2 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -683,6 +683,13 @@ batadv_hardif_add_interface(struct net_device *net_dev) if (batadv_is_wifi_netdev(net_dev)) hard_iface->num_bcasts = BATADV_NUM_BCASTS_WIRELESS;
- /* enable link throughput auto-detection by setting the throughput
* override to zero*/- atomic_set(&hard_iface->bat_v.throughput_override, 0);
- atomic_set(&hard_iface->bat_v.elp_interval, 500);
- /* extra reference for return */ kref_init(&hard_iface->refcount); kref_get(&hard_iface->refcount);
This needs to check if BATMAN_V is enabled:
/home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:689:31: error: no member 'bat_v' in struct batadv_hard_iface /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:691:31: error: no member 'bat_v' in struct batadv_hard_iface /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c: In function 'batadv_hardif_add_interface': /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:689:24: error: 'struct batadv_hard_iface' has no member named 'bat_v' atomic_set(&hard_iface->bat_v.throughput_override, 0); ^ /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:691:24: error: 'struct batadv_hard_iface' has no member named 'bat_v' atomic_set(&hard_iface->bat_v.elp_interval, 500); ^ make[2]: *** [/home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.o] Error 1 make[1]: *** [_module_/home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv] Error 2 make: *** [all] Error 2
This report was brought to you by todays build test [1] - the leading provider of "omg, batman-adv doesn't build cleanly"
Kind regards, Sven
[1] https://lists.open-mesh.org/pipermail/linux-merge/2016-May/003168.html