In a few situations batman-adv tries to determine whether a given interface is a WiFi interface to enable specific WiFi optimizations. If the interface batman-adv has been configured with is a virtual interface (e.g. VLAN) it would not be properly detected as WiFi interface and thus not benefit from the special WiFi treatment. This patch changes that by peeking under the hood whenever a virtual interface is in play. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch&gt; --- net/batman-adv/hard-interface.c | 85 ++++++++++++++++++++++++++++++++++++++--- net/batman-adv/hard-interface.h | 1 + 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 478977b..6324474 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -166,14 +166,51 @@ static bool batadv_is_valid_iface(const struct net_device *net_dev) } /** - * batadv_is_cfg80211_netdev - check if the given net_device struct is a - * cfg80211 wifi interface + * 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 batadv_hard_iface *hard_iface = NULL; + struct net_device *real_netdev = NULL; + struct net *net; + int ifindex; + + if (!net_device) + return NULL; + + if (net_device->ifindex == dev_get_iflink(net_device)) { + dev_hold(net_device); + return net_device; + } + + hard_iface = batadv_hardif_get_by_netdev(net_device); + if (!hard_iface || !hard_iface->soft_iface) + goto out; + + net = dev_net(hard_iface->soft_iface); + ifindex = dev_get_iflink(net_device); + real_netdev = dev_get_by_index(net, ifindex); + +out: + if (hard_iface) + batadv_hardif_put(hard_iface); + return real_netdev; +} + +/** + * _batadv_is_cfg80211_netdev - check if the given net_device struct is a + * cfg80211 wifi interface (without real netdev check) * @net_device: the device to check * * Return: true if the net device is a cfg80211 wireless device, false * otherwise. */ -bool batadv_is_cfg80211_netdev(struct net_device *net_device) +static bool _batadv_is_cfg80211_netdev(struct net_device *net_device) { if (!net_device) return false; @@ -186,6 +223,32 @@ bool batadv_is_cfg80211_netdev(struct net_device *net_device) } /** + * batadv_is_cfg80211_netdev - check if the given net_device struct is a + * cfg80211 wifi interface + * @net_device: the device to check + * + * Return: true if the net device is a cfg80211 wireless device, false + * otherwise. + */ +bool batadv_is_cfg80211_netdev(struct net_device *net_device) +{ + struct net_device *real_netdev; + bool ret; + + if (!net_device) + return false; + + real_netdev = batadv_get_real_netdev(net_device); + if (!real_netdev) + return false; + + ret = _batadv_is_cfg80211_netdev(real_netdev); + + dev_put(real_netdev); + return ret; +} + +/** * batadv_is_wifi_netdev - check if the given net_device struct is a wifi * interface * @net_device: the device to check @@ -194,18 +257,30 @@ bool batadv_is_cfg80211_netdev(struct net_device *net_device) */ bool batadv_is_wifi_netdev(struct net_device *net_device) { + struct net_device *real_netdev; + bool ret; + if (!net_device) return false; + real_netdev = batadv_get_real_netdev(net_device); + if (!real_netdev) + return false; + #ifdef CONFIG_WIRELESS_EXT /* pre-cfg80211 drivers have to implement WEXT, so it is possible to * check for wireless_handlers != NULL */ - if (net_device->wireless_handlers) + if (real_netdev->wireless_handlers) { + dev_put(real_netdev); return true; + } #endif - return batadv_is_cfg80211_netdev(net_device); + ret = _batadv_is_cfg80211_netdev(real_netdev); + + dev_put(real_netdev); + return ret; } static struct batadv_hard_iface * diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index e0893de..a14316d 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_netdev(struct net_device *net_device); bool batadv_is_wifi_netdev(struct net_device *net_device); bool batadv_is_wifi_iface(int ifindex); -- 2.8.0.rc3

Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch&gt; --- net/batman-adv/bat_v_elp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 51fc08d..7ed3360 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 -- 2.8.0.rc3