summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_vti.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-04-02 17:07:01 +0200
committerDavid S. Miller <davem@davemloft.net>2015-04-02 14:04:59 -0400
commitecf2c06a88d2ed534a87b84b8c1a467ab23352dd (patch)
treeab6cbc9125c1b34fa2bded7795bc6c30505f72d5 /net/ipv6/ip6_vti.c
parenta54acb3a6f853e8394c4cb7b6a4d93c88f13eefd (diff)
downloadop-kernel-dev-ecf2c06a88d2ed534a87b84b8c1a467ab23352dd.zip
op-kernel-dev-ecf2c06a88d2ed534a87b84b8c1a467ab23352dd.tar.gz
ip6tnl,gre6,vti6: 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/ipv6/ip6_vti.c')
-rw-r--r--net/ipv6/ip6_vti.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 53d90ed..b531484 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -601,8 +601,6 @@ static void vti6_link_config(struct ip6_tnl *t)
dev->flags |= IFF_POINTOPOINT;
else
dev->flags &= ~IFF_POINTOPOINT;
-
- dev->iflink = p->link;
}
/**
@@ -808,6 +806,7 @@ static const struct net_device_ops vti6_netdev_ops = {
.ndo_do_ioctl = vti6_ioctl,
.ndo_change_mtu = vti6_change_mtu,
.ndo_get_stats64 = ip_tunnel_get_stats64,
+ .ndo_get_iflink = ip6_tnl_get_iflink,
};
/**
OpenPOWER on IntegriCloud