batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch

   1 From: Sven Eckelmann <sven@narfation.org>
   2 Date: Fri, 9 Jun 2017 17:06:50 +0200
   3 Subject: batman-adv: Use default throughput value on cfg80211 error
   4
   5 A wifi interface should never be handled like an ethernet devices. The
   6 parser of the cfg80211 output must therefore skip the ethtool code when
   7 cfg80211_get_station returned an error.
   8
   9 Fixes: 01b1fe819ee0 ("batman-adv: refactor wifi interface detection")
  10 Signed-off-by: Sven Eckelmann <sven@narfation.org>
  11 Reviewed-by: Marek Lindner <mareklindner@neomailbox.ch>
  12 Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
  13
  14 Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/76ef29071b0050f972a626747d034a494a7195d7
  15
  16 diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
  17 index f2fb2f05b6bf280d2b5fae26ed10288f73345f16..7c54a9291c9eaed75dfdfdfbd200f84c51576cb3 100644
  18 --- a/net/batman-adv/bat_v_elp.c
  19 +++ b/net/batman-adv/bat_v_elp.c
  20 @@ -109,8 +109,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
  21                          */
  22                         return 0;
  23                 }
  24 -               if (!ret)
  25 -                       return sinfo.expected_throughput / 100;
  26 +               if (ret)
  27 +                       goto default_throughput;
  28 +
  29 +               return sinfo.expected_throughput / 100;
  30         }
  31
  32         /* if not a wifi interface, check if this device provides data via