diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-11-19 11:13:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-19 11:13:05 -0500 |
| commit | f463c99b208718b4fd25ec3501e0bd9d2e30f522 (patch) | |
| tree | 80d11b604e08458b4bf45684aca47a8421056c56 /net/batman-adv/hard-interface.h | |
| parent | af_packet: Use virtio_net_hdr_from_skb() directly. (diff) | |
| parent | batman-adv: fix rare race conditions on interface removal (diff) | |
| download | linux-dev-f463c99b208718b4fd25ec3501e0bd9d2e30f522.tar.xz linux-dev-f463c99b208718b4fd25ec3501e0bd9d2e30f522.zip | |
Merge tag 'batadv-next-for-davem-20161119' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- 6 patches adding functionality to detect a WiFi interface under
other virtual interfaces, like VLANs. They introduce a cache for
the detected the WiFi configuration to avoid RTNL locking in
critical sections. Patches have been prepared by Marek Lindner
and Sven Eckelmann
- Enable automatic module loading for genl requests, by Sven Eckelmann
- Fix a potential race condition on interface removal. This is not
happening very often in practice, but requires bigger changes to fix,
so we are sending this to net-next. By Linus Luessing
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/hard-interface.h')
| -rw-r--r-- | net/batman-adv/hard-interface.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index a043182586e9..d6309a423629 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -65,8 +65,9 @@ enum batadv_hard_if_cleanup { extern struct notifier_block batadv_hard_if_notifier; -bool batadv_is_wifi_netdev(struct net_device *net_device); -bool batadv_is_wifi_iface(int ifindex); +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* batadv_hardif_get_by_netdev(const struct net_device *net_dev); int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, |