summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bat_v_elp.c
diff options
context:
space:
mode:
authorMarek Lindner <mareklindner@neomailbox.ch>2016-09-30 15:21:05 +0200
committerSimon Wunderlich <sw@simonwunderlich.de>2016-11-08 19:02:38 +0100
commit1942de1bbac30118a96255af1d14d1449aeb1a38 (patch)
tree8f0688aa60f5634e6bd1ad8d209313942d9a56fd /net/batman-adv/bat_v_elp.c
parent5ed4a460a1d359e1e9e7f54f6c78dfa9d1586b4b (diff)
downloadlinux-1942de1bbac30118a96255af1d14d1449aeb1a38.tar.gz
linux-1942de1bbac30118a96255af1d14d1449aeb1a38.tar.bz2
linux-1942de1bbac30118a96255af1d14d1449aeb1a38.zip
batman-adv: retrieve B.A.T.M.A.N. V WiFi neighbor stats from real interface
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> [sven.eckelmann@open-mesh.com: re-add batadv_get_real_netdev to take rtnl semaphore for batadv_get_real_netdevice] Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/bat_v_elp.c')
-rw-r--r--net/batman-adv/bat_v_elp.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 0d7868912253..f2fb2f05b6bf 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -75,6 +75,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
{
struct batadv_hard_iface *hard_iface = neigh->if_incoming;
struct ethtool_link_ksettings link_settings;
+ struct net_device *real_netdev;
struct station_info sinfo;
u32 throughput;
int ret;
@@ -94,8 +95,13 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
/* unsupported WiFi driver version */
goto default_throughput;
- ret = cfg80211_get_station(hard_iface->net_dev,
- neigh->addr, &sinfo);
+ real_netdev = batadv_get_real_netdev(hard_iface->net_dev);
+ if (!real_netdev)
+ goto default_throughput;
+
+ ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo);
+
+ dev_put(real_netdev);
if (ret == -ENOENT) {
/* Node is not associated anymore! It would be
* possible to delete this neighbor. For now set