diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-04-02 17:07:02 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-02 14:05:00 -0400 |
commit | 1e99584b911cb6f3d2a681e2532d8dc3f9339c9c (patch) | |
tree | eec4ef0b2a2179418d5a4c7525eaec261d273bf5 /net/ipv4/ip_vti.c | |
parent | ecf2c06a88d2ed534a87b84b8c1a467ab23352dd (diff) | |
download | linux-stable-1e99584b911cb6f3d2a681e2532d8dc3f9339c9c.tar.gz linux-stable-1e99584b911cb6f3d2a681e2532d8dc3f9339c9c.tar.bz2 linux-stable-1e99584b911cb6f3d2a681e2532d8dc3f9339c9c.zip |
ipip,gre,vti,sit: implement ndo_get_iflink
Don't use dev->iflink anymore.
CC: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_vti.c')
-rw-r--r-- | net/ipv4/ip_vti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 5a6e27054f0a..c4f93c0d1104 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -341,6 +341,7 @@ static const struct net_device_ops vti_netdev_ops = { .ndo_do_ioctl = vti_tunnel_ioctl, .ndo_change_mtu = ip_tunnel_change_mtu, .ndo_get_stats64 = ip_tunnel_get_stats64, + .ndo_get_iflink = ip_tunnel_get_iflink, }; static void vti_tunnel_setup(struct net_device *dev) @@ -361,7 +362,6 @@ static int vti_tunnel_init(struct net_device *dev) dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); dev->mtu = ETH_DATA_LEN; dev->flags = IFF_NOARP; - dev->iflink = 0; dev->addr_len = 4; dev->features |= NETIF_F_LLTX; netif_keep_dst(dev); |