diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-04-02 17:07:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-02 14:05:00 -0400 |
| commit | 7c4116588b2ad5f45c693e0f12b612b621604c92 (patch) | |
| tree | 4b625cb2caab411a9583f2f52c57fc43e95d8b8a /drivers/net/ipvlan | |
| parent | ef5fa6bc46ee516f732d1171323cf3b8524bb8c2 (diff) | |
| download | op-kernel-dev-7c4116588b2ad5f45c693e0f12b612b621604c92.zip op-kernel-dev-7c4116588b2ad5f45c693e0f12b612b621604c92.tar.gz | |
ipvlan: implement ndo_get_iflink
Don't use dev->iflink anymore.
CC: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipvlan')
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 2950c37..1701ede 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -114,7 +114,6 @@ static int ipvlan_init(struct net_device *dev) dev->features = phy_dev->features & IPVLAN_FEATURES; dev->features |= NETIF_F_LLTX; dev->gso_max_size = phy_dev->gso_max_size; - dev->iflink = phy_dev->ifindex; dev->hard_header_len = phy_dev->hard_header_len; ipvlan_set_lockdep_class(dev); @@ -305,6 +304,13 @@ static int ipvlan_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, return 0; } +static int ipvlan_get_iflink(const struct net_device *dev) +{ + struct ipvl_dev *ipvlan = netdev_priv(dev); + + return ipvlan->phy_dev->ifindex; +} + static const struct net_device_ops ipvlan_netdev_ops = { .ndo_init = ipvlan_init, .ndo_uninit = ipvlan_uninit, @@ -317,6 +323,7 @@ static const struct net_device_ops ipvlan_netdev_ops = { .ndo_get_stats64 = ipvlan_get_stats64, .ndo_vlan_rx_add_vid = ipvlan_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = ipvlan_vlan_rx_kill_vid, + .ndo_get_iflink = ipvlan_get_iflink, }; static int ipvlan_hard_header(struct sk_buff *skb, struct net_device *dev, |
