batman-adv: upgrade package to latest release 2016.5

[feed/routing.git] / batman-adv / patches / 0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch

diff --git a/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch b/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
deleted file mode 100644 (file)
index 37c676d..0000000
--- a/batman-adv/patches/0003-batman-adv-Detect-missing-primaryif-during-tp_send-a.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Sven Eckelmann <sven@narfation.org>
-Date: Sat, 29 Oct 2016 09:18:43 +0200
-Subject: [PATCH] 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: 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(+)
-
-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;
-       }
-