diff options
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) | |||
601 | dev->flags |= IFF_POINTOPOINT; | 601 | dev->flags |= IFF_POINTOPOINT; |
602 | else | 602 | else |
603 | dev->flags &= ~IFF_POINTOPOINT; | 603 | dev->flags &= ~IFF_POINTOPOINT; |
604 | |||
605 | dev->iflink = p->link; | ||
606 | } | 604 | } |
607 | 605 | ||
608 | /** | 606 | /** |
@@ -808,6 +806,7 @@ static const struct net_device_ops vti6_netdev_ops = { | |||
808 | .ndo_do_ioctl = vti6_ioctl, | 806 | .ndo_do_ioctl = vti6_ioctl, |
809 | .ndo_change_mtu = vti6_change_mtu, | 807 | .ndo_change_mtu = vti6_change_mtu, |
810 | .ndo_get_stats64 = ip_tunnel_get_stats64, | 808 | .ndo_get_stats64 = ip_tunnel_get_stats64, |
809 | .ndo_get_iflink = ip6_tnl_get_iflink, | ||
811 | }; | 810 | }; |
812 | 811 | ||
813 | /** | 812 | /** |