OSDN Git Service

batman-adv: Use default throughput value on cfg80211 error
authorSven Eckelmann <sven@narfation.org>
Fri, 9 Jun 2017 15:06:50 +0000 (17:06 +0200)
committerSimon Wunderlich <sw@simonwunderlich.de>
Tue, 13 Jun 2017 10:24:02 +0000 (12:24 +0200)
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@narfation.org>
Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
net/batman-adv/bat_v_elp.c

index b90c990..96e7333 100644 (file)
@@ -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