pull request for net: batman-adv 2019-06-27
Subsystems (3)
Simon Wunderlich
maintainercover pull request for net: batman-adv 2019-06-27
Hi David,
here are some bugfixes which we would like to have integrated into net.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20190627
for you to fetch changes up to 9e6b5648bbc4cd48fab62cecbb81e9cc3c6e7e88:
batman-adv: Fix duplicated OGMs on NETDEV_UP (2019-06-02 13:33:48 +0200)
----------------------------------------------------------------
Here are some batman-adv bugfixes:
- fix a leaked TVLV handler which wasn't unregistered, by Jeremy Sowden
- fix duplicated OGMs when interfaces are set UP, by Sven Eckelmann
----------------------------------------------------------------
Jeremy Sowden (1):
batman-adv: fix for leaked TVLV handler.
Sven Eckelmann (1):
batman-adv: Fix duplicated OGMs on NETDEV_UP
net/batman-adv/bat_iv_ogm.c | 4 ++-- net/batman-adv/hard-interface.c | 3 +++ net/batman-adv/translation-table.c | 2 ++ net/batman-adv/types.h | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-)
Simon Wunderlich
maintainerPATCH 1/2 batman-adv: fix for leaked TVLV handler.
From: Jeremy Sowden <[email protected]>
A handler for BATADV_TVLV_ROAM was being registered when the translation-table was initialized, but not unregistered when the translation-table was freed. Unregister it.
--- net/batman-adv/translation-table.c | 2 ++ 1 file changed, 2 insertions(+)
net/batman-adv/translation-table.c +2 -0
@@ -3813,6 +3813,8 @@ static void batadv_tt_purge(struct work_struct *work)*/ void batadv_tt_free (struct batadv_priv *bat_priv) { +batadv_tvlv_handler_unregister (bat_priv,BATADV_TVLV_ROAM ,1 ); +batadv_tvlv_container_unregister (bat_priv,BATADV_TVLV_TT ,1 );batadv_tvlv_handler_unregister (bat_priv,BATADV_TVLV_TT ,1 );
Signature · 1 line
2.11.0
Simon Wunderlich
maintainerPATCH 2/2 batman-adv: Fix duplicated OGMs on NETDEV_UP
In reply to Simon WunderlichFrom: Sven Eckelmann <[email protected]>
The state of slave interfaces are handled differently depending on whether the interface is up or not. All active interfaces (IFF_UP) will transmit OGMs. But for B.A.T.M.A.N. IV, also non-active interfaces are scheduling (low TTL) OGMs on active interfaces. The code which setups and schedules the OGMs must therefore already be called when the interfaces gets added as slave interface and the transmit function must then check whether it has to send out the OGM or not on the specific slave interface.
But the commit f0d97253fb5f ("batman-adv: remove ogm_emit and ogm_schedule API calls") moved the setup code from the enable function to the activate function. The latter is called either when the added slave was already up when batadv_hardif_enable_interface processed the new interface or when a NETDEV_UP event was received for this slave interfac. As result, each NETDEV_UP would schedule a new OGM worker for the interface and thus OGMs would be send a lot more than expected.
--- net/batman-adv/bat_iv_ogm.c | 4 ++-- net/batman-adv/hard-interface.c | 3 +++ net/batman-adv/types.h | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-)
net/batman-adv/bat_iv_ogm.c +2 -2
@@ -2337,7 +2337,7 @@ batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,return ret; } -static void batadv_iv_iface_activate (struct batadv_hard_iface *hard_iface) +static void batadv_iv_iface_enabled (struct batadv_hard_iface *hard_iface) {/* begin scheduling originator messages on that interface */ batadv_iv_ogm_schedule (hard_iface);
@@ -2683,8 +2683,8 @@ static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,static struct batadv_algo_ops batadv_batman_iv__read_mostly = { .name ="BATMAN_IV" , .iface = { - .activate = batadv_iv_iface_activate, .enable = batadv_iv_ogm_iface_enable, + .enabled = batadv_iv_iface_enabled, .disable = batadv_iv_ogm_iface_disable, .update_mac = batadv_iv_ogm_iface_update_mac, .primary_set = batadv_iv_ogm_primary_iface_set,
net/batman-adv/hard-interface.c +3 -0
@@ -795,6 +795,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,batadv_hardif_recalc_extra_skbroom (soft_iface); +if (bat_priv->algo_ops->iface.enabled) + bat_priv->algo_ops->iface.enabled (hard_iface); + out:return 0 ;
net/batman-adv/types.h +3 -0
@@ -2129,6 +2129,9 @@ struct batadv_algo_iface_ops {/** @enable: init routing info when hard-interface is enabled */ int (*enable)(struct batadv_hard_iface *hard_iface); +/** @enabled: notification when hard-interface was enabled (optional) */ +void (*enabled)(struct batadv_hard_iface *hard_iface); +/** @disable: de-init routing info when hard-interface is disabled */ void (*disable)(struct batadv_hard_iface *hard_iface);
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Simon Wunderlich <[email protected]>
Date: Thu, 27 Jun 2019 12:31:17 +0200
Quoted 3 lines
here are some bugfixes which we would like to have integrated into net.
Please pull or let me know of any problem!
Pulled, thanks Simon.