diff options
| author | Sven Eckelmann <sven@narfation.org> | 2017-06-09 17:06:50 +0200 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2017-06-13 12:24:02 +0200 |
| commit | 3f3f87325dcb3c201076c81490f4da91ad4c09fc (patch) | |
| tree | 42dcc8909bca16d91c0d9a28922f00511fd0b674 /net/batman-adv | |
| parent | 75ae84a4fe94133df9293540ad0d2d5c3697edcb (diff) | |
| download | linux-stable-3f3f87325dcb3c201076c81490f4da91ad4c09fc.tar.gz linux-stable-3f3f87325dcb3c201076c81490f4da91ad4c09fc.tar.bz2 linux-stable-3f3f87325dcb3c201076c81490f4da91ad4c09fc.zip | |
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@narfation.org>
Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/bat_v_elp.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 |