aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2016-10-29 09:18:43 +0200
committerSimon Wunderlich <sw@simonwunderlich.de>2016-11-04 12:27:39 +0100
commite13258f38e927b61cdb5f4ad25309450d3b127d1 (patch)
tree7aff8e664704feeda9cf96deed3b61681782c8b6 /net/batman-adv
parentbatman-adv: Revert "fix splat on disabling an interface" (diff)
downloadlinux-dev-e13258f38e927b61cdb5f4ad25309450d3b127d1.tar.xz
linux-dev-e13258f38e927b61cdb5f4ad25309450d3b127d1.zip
batman-adv: Detect missing primaryif during tp_send as error
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>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/tp_meter.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 2333777f919d..8af1611b8ab2 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;
}