[linux-next] LinuxNextTracking branch, master, updated. next-20161122

batman at open-mesh.org batman at open-mesh.org
Wed Nov 23 00:15:58 CET 2016


The following commit has been merged in the master branch:
commit e13258f38e927b61cdb5f4ad25309450d3b127d1
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Oct 29 09:18:43 2016 +0200

    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 at perches.com>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

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

-- 
LinuxNextTracking


More information about the linux-merge mailing list