From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Sven Eckelmann <sven.eckelmann@open-mesh.com>,
Marek Lindner <mareklindner@neomailbox.ch>
Subject: [B.A.T.M.A.N.] [PATCH v2 6/7] batman-adv: retrieve B.A.T.M.A.N. V WiFi neighbor stats from real interface
Date: Fri, 30 Sep 2016 15:21:05 +0200 [thread overview]
Message-ID: <20160930132106.5798-6-sven.eckelmann@open-mesh.com> (raw)
In-Reply-To: <2666783.nl87Kib46y@bentobox>
From: Marek Lindner <mareklindner@neomailbox.ch>
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>
---
v2:
- reintroduce batadv_get_real_netdev for situations were the rtnl_lock
has to be taken
---
net/batman-adv/bat_v_elp.c | 10 ++++++++--
net/batman-adv/hard-interface.c | 22 ++++++++++++++++++++++
net/batman-adv/hard-interface.h | 1 +
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index cdcaf6b..89488dc 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
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index ba587fb..7d336e1 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -206,6 +206,9 @@ static bool batadv_is_valid_iface(const struct net_device *net_dev)
* interface on top of another 'real' interface
* @netdev: the device to check
*
+ * Callers must hold the rtnl semaphore. You may want batadv_get_real_netdev()
+ * instead of this.
+ *
* Return: the 'real' net device or the original net device and NULL in case
* of an error.
*/
@@ -243,6 +246,25 @@ out:
}
/**
+ * batadv_get_real_netdev - check if the given net_device struct is a virtual
+ * interface on top of another 'real' interface
+ * @net_device: the device to check
+ *
+ * Return: the 'real' net device or the original net device and NULL in case
+ * of an error.
+ */
+struct net_device *batadv_get_real_netdev(struct net_device *net_device)
+{
+ struct net_device *real_netdev = NULL;
+
+ rtnl_lock();
+ real_netdev = batadv_get_real_netdevice(net_device);
+ rtnl_unlock();
+
+ return real_netdev;
+}
+
+/**
* batadv_is_wext_netdev - check if the given net_device struct is a
* wext wifi interface
* @net_device: the device to check
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index 957fd8f..0c7ff14 100644
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -51,6 +51,7 @@ enum batadv_hard_if_cleanup {
extern struct notifier_block batadv_hard_if_notifier;
+struct net_device *batadv_get_real_netdev(struct net_device *net_device);
bool batadv_is_cfg80211_hardif(struct batadv_hard_iface *hard_iface);
bool batadv_is_wifi_hardif(struct batadv_hard_iface *hard_iface);
struct batadv_hard_iface*
--
2.9.3
next prev parent reply other threads:[~2016-09-30 13:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 13:20 [B.A.T.M.A.N.] [PATCH v2 0/7] batman-adv: wifi interface detection on Sven Eckelmann
2016-09-30 13:21 ` [B.A.T.M.A.N.] [PATCH v2 1/7] batman-adv: Return non-const ptr in batadv_getlink_net Sven Eckelmann
2016-09-30 13:21 ` [B.A.T.M.A.N.] [PATCH v2 2/7] batman-adv: Close two alignment holes in batadv_hard_iface Sven Eckelmann
2016-09-30 13:21 ` [B.A.T.M.A.N.] [PATCH v2 3/7] batman-adv: refactor wifi interface detection Sven Eckelmann
2016-09-30 13:21 ` [B.A.T.M.A.N.] [PATCH v2 4/7] batman-adv: Cache the type of wifi device for each hardif Sven Eckelmann
2016-09-30 13:21 ` [B.A.T.M.A.N.] [PATCH v2 5/7] batman-adv: additional checks for virtual interfaces on top of WiFi Sven Eckelmann
2016-09-30 13:21 ` Sven Eckelmann [this message]
2016-09-30 13:21 ` [B.A.T.M.A.N.] [PATCH v2 7/7] batman-adv: Update wifi flags on upper link change Sven Eckelmann
2016-10-24 10:20 ` [B.A.T.M.A.N.] [PATCH v2 0/7] batman-adv: wifi interface detection on Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160930132106.5798-6-sven.eckelmann@open-mesh.com \
--to=sven.eckelmann@open-mesh.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=mareklindner@neomailbox.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).