[commits] [batman-adv] master: batman-adv: Use default throughput value on cfg80211 error (76ef2907)

postmaster at open-mesh.org postmaster at open-mesh.org
Tue Jun 13 12:09:36 CEST 2017


Repository : ssh://git@open-mesh.org/batman-adv

On branch  : master

>---------------------------------------------------------------

commit 76ef29071b0050f972a626747d034a494a7195d7
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: 01b1fe819ee0 ("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>


>---------------------------------------------------------------

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 b90c9903..96e73337 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 commits mailing list