diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-20 18:57:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-20 18:57:38 +0300 |
| commit | 0d7043f355d0045bd38b025630a7defefa3ec07f (patch) | |
| tree | 27ff984e5d4dda3bfefd57bb9122e28711350fde /drivers/net/wireless/virt_wifi.c | |
| parent | ffe10e679cec9a99f19049459cb27c2fbb1e913a (diff) | |
| parent | 8fa180bb4aceaa25233ea61032eab5b025fb522f (diff) | |
| download | linux-0d7043f355d0045bd38b025630a7defefa3ec07f.tar.xz | |
Merge tag 'mac80211-next-for-net-next-2020-03-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of changes:
* HE ranging (fine timing measurement) API support
* hwsim gets virtio support, for use with wmediumd,
to be able to simulate with multiple machines
* eapol-over-nl80211 improvements to exclude preauth
* IBSS reset support, to recover connections from
userspace
* and various others.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/virt_wifi.c')
| -rw-r--r-- | drivers/net/wireless/virt_wifi.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virt_wifi.c index 01305ba2d3aa..c878097f0dda 100644 --- a/drivers/net/wireless/virt_wifi.c +++ b/drivers/net/wireless/virt_wifi.c @@ -436,10 +436,18 @@ static int virt_wifi_net_device_stop(struct net_device *dev) return 0; } +static int virt_wifi_net_device_get_iflink(const struct net_device *dev) +{ + struct virt_wifi_netdev_priv *priv = netdev_priv(dev); + + return priv->lowerdev->ifindex; +} + static const struct net_device_ops virt_wifi_ops = { .ndo_start_xmit = virt_wifi_start_xmit, - .ndo_open = virt_wifi_net_device_open, - .ndo_stop = virt_wifi_net_device_stop, + .ndo_open = virt_wifi_net_device_open, + .ndo_stop = virt_wifi_net_device_stop, + .ndo_get_iflink = virt_wifi_net_device_get_iflink, }; /* Invoked as part of rtnl lock release. */ |