diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-04-02 17:07:01 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-04-02 14:04:59 -0400 |
| commit | ecf2c06a88d2ed534a87b84b8c1a467ab23352dd (patch) | |
| tree | ab6cbc9125c1b34fa2bded7795bc6c30505f72d5 /net/ipv6/ip6_vti.c | |
| parent | dev: introduce dev_get_iflink() (diff) | |
| download | linux-dev-ecf2c06a88d2ed534a87b84b8c1a467ab23352dd.tar.xz linux-dev-ecf2c06a88d2ed534a87b84b8c1a467ab23352dd.zip | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 53d90ed68905..b53148444e15 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, }; /** |