[maint] batman-adv: Detect missing primaryif during tp_send as error

Message ID 20161029071843.4614-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 41af4814a81c0ff3c228f130578347b2f77805e0
Delegated to: Sven Eckelmann
Headers

Commit Message

Sven Eckelmann Oct. 29, 2016, 7:18 a.m. UTC
  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: 98d7a766b645 ("batman-adv: throughput meter implementation")
Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 net/batman-adv/tp_meter.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Sven Eckelmann Nov. 4, 2016, 7:14 a.m. UTC | #1
On Samstag, 29. Oktober 2016 09:18:43 CET Sven Eckelmann wrote:
> 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: 98d7a766b645 ("batman-adv: throughput meter implementation")
> Reported-by: Joe Perches <joe@perches.com>
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
>  net/batman-adv/tp_meter.c | 1 +
>  1 file changed, 1 insertion(+)

Applied in 41af4814a81c0ff3c228f130578347b2f77805e0 [1].

Kind regards,
        Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/41af4814a81c0ff3c228f130578347b2f77805e0
  

Patch

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;
 	}