Merge pull request #463 from ecsv/batadv-17.01

[feed/routing.git] / batman-adv / patches / 0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch

diff --git a/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch b/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch
index 6728e45e9d62c865461ac3b054b293246558830d..c3e3f7bd90efed025fb664ede9cea9f9bbcbc215 100644 (file)
--- a/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch
+++ b/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch
@@ -1,6 +1,6 @@
 From: Sven Eckelmann <sven@narfation.org>
 Date: Fri, 9 Jun 2017 17:06:50 +0200
-Subject: [PATCH] batman-adv: Use default throughput value on cfg80211 error
+Subject: batman-adv: Use default throughput value on cfg80211 error
 
 A wifi interface should never be handled like an ethernet devices. The
 parser of the cfg80211 output must therefore skip the ethtool code when
@@ -12,9 +12,6 @@ Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch>
 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
 
 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/76ef29071b0050f972a626747d034a494a7195d7
----
- net/batman-adv/bat_v_elp.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
 index f2fb2f05b6bf280d2b5fae26ed10288f73345f16..7c54a9291c9eaed75dfdfdfbd200f84c51576cb3 100644