diff options
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
-rw-r--r-- | net/ipv4/ip_tunnel.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 2cd08280c77b..4bb7252110a6 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c | |||
@@ -389,7 +389,6 @@ static int ip_tunnel_bind_dev(struct net_device *dev) | |||
389 | hlen = tdev->hard_header_len + tdev->needed_headroom; | 389 | hlen = tdev->hard_header_len + tdev->needed_headroom; |
390 | mtu = tdev->mtu; | 390 | mtu = tdev->mtu; |
391 | } | 391 | } |
392 | dev->iflink = tunnel->parms.link; | ||
393 | 392 | ||
394 | dev->needed_headroom = t_hlen + hlen; | 393 | dev->needed_headroom = t_hlen + hlen; |
395 | mtu -= (dev->hard_header_len + t_hlen); | 394 | mtu -= (dev->hard_header_len + t_hlen); |
@@ -980,6 +979,14 @@ struct net *ip_tunnel_get_link_net(const struct net_device *dev) | |||
980 | } | 979 | } |
981 | EXPORT_SYMBOL(ip_tunnel_get_link_net); | 980 | EXPORT_SYMBOL(ip_tunnel_get_link_net); |
982 | 981 | ||
982 | int ip_tunnel_get_iflink(const struct net_device *dev) | ||
983 | { | ||
984 | struct ip_tunnel *tunnel = netdev_priv(dev); | ||
985 | |||
986 | return tunnel->parms.link; | ||
987 | } | ||
988 | EXPORT_SYMBOL(ip_tunnel_get_iflink); | ||
989 | |||
983 | int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, | 990 | int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, |
984 | struct rtnl_link_ops *ops, char *devname) | 991 | struct rtnl_link_ops *ops, char *devname) |
985 | { | 992 | { |