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

batman at open-mesh.org batman at open-mesh.org
Thu Jun 15 00:15:38 CEST 2017

The following commit has been merged in the master branch:
commit 3f3f87325dcb3c201076c81490f4da91ad4c09fc
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jun 9 17:06:50 2017 +0200

    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
    cfg80211_get_station returned an error.
    Fixes: f44a3ae9a281 ("batman-adv: refactor wifi interface detection")
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Reviewed-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index b90c9903e246..96e7333764f0 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -109,8 +109,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
 			return 0;
-		if (!ret)
-			return sinfo.expected_throughput / 100;
+		if (ret)
+			goto default_throughput;
+		return sinfo.expected_throughput / 100;
 	/* if not a wifi interface, check if this device provides data via


More information about the linux-merge mailing list