Hi David,
here are some bugfix patches 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 9799c50372b23ed774791bdb87d700f1286ee8a9:
batman-adv: fix splat on disabling an interface (2016-10-21 14:47:02 +0200)
are available in the git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20161119
for you to fetch changes up to e13258f38e927b61cdb5f4ad25309450d3b127d1:
batman-adv: Detect missing primaryif during tp_send as error (2016-11-04 12:27:39 +0100)
---------------------------------------------------------------- Here are two batman-adv bugfix patches:
- Revert a splat on disabling interface which created another problem, by Sven Eckelmann
- Fix error handling when the primary interface disappears during a throughput meter test, by Sven Eckelmann
---------------------------------------------------------------- Sven Eckelmann (2): batman-adv: Revert "fix splat on disabling an interface" batman-adv: Detect missing primaryif during tp_send as error
net/batman-adv/hard-interface.c | 1 + net/batman-adv/tp_meter.c | 1 + 2 files changed, 2 insertions(+)
From: Sven Eckelmann sven@narfation.org
The commit 9799c50372b2 ("batman-adv: fix splat on disabling an interface") fixed a warning but at the same time broke the rtnl function add_slave for devices which were temporarily removed.
batadv_softif_slave_add requires soft_iface of and hard_iface to be NULL before it is allowed to be enslaved. But this resetting of soft_iface to NULL in batadv_hardif_disable_interface was removed with the aforementioned commit.
Reported-by: Julian Labus julian@freifunk-rtk.de Signed-off-by: Sven Eckelmann sven@narfation.org Acked-by: Linus Lüssing linus.luessing@c0d3.blue Signed-off-by: Simon Wunderlich sw@simonwunderlich.de --- net/batman-adv/hard-interface.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index e034afb..08ce361 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, batadv_softif_destroy_sysfs(hard_iface->soft_iface); }
+ hard_iface->soft_iface = NULL; batadv_hardif_put(hard_iface);
out:
From: Sven Eckelmann sven@narfation.org
The throughput meter detects different situations as problems for the current test. It stops the test after these and reports it to userspace. This also has to be done when the primary interface disappeared during the test.
Fixes: 33a3bb4a3345 ("batman-adv: throughput meter implementation") Reported-by: Joe Perches joe@perches.com Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de --- net/batman-adv/tp_meter.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 2333777..8af1611 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg) primary_if = batadv_primary_if_get_selected(bat_priv); if (unlikely(!primary_if)) { err = BATADV_TP_REASON_DST_UNREACHABLE; + tp_vars->reason = err; goto out; }
From: Simon Wunderlich sw@simonwunderlich.de Date: Sat, 19 Nov 2016 12:06:12 +0100
here are some bugfix patches which we would like to have integrated into net.
Please pull or let me know of any problem!
Pulled.
b.a.t.m.a.n@lists.open-mesh.org
-
David Miller -
Simon Wunderlich