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 20:05:00 +0200 |
| commit | 1e99584b911cb6f3d2a681e2532d8dc3f9339c9c (patch) | |
| tree | eec4ef0b2a2179418d5a4c7525eaec261d273bf5 /net/ipv4/ip_tunnel.c | |
| parent | ip6tnl,gre6,vti6: implement ndo_get_iflink (diff) | |
| download | linux-1e99584b911cb6f3d2a681e2532d8dc3f9339c9c.tar.xz linux-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_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) hlen = tdev->hard_header_len + tdev->needed_headroom; mtu = tdev->mtu; } - dev->iflink = tunnel->parms.link; dev->needed_headroom = t_hlen + hlen; mtu -= (dev->hard_header_len + t_hlen); @@ -980,6 +979,14 @@ struct net *ip_tunnel_get_link_net(const struct net_device *dev) } EXPORT_SYMBOL(ip_tunnel_get_link_net); +int ip_tunnel_get_iflink(const struct net_device *dev) +{ + struct ip_tunnel *tunnel = netdev_priv(dev); + + return tunnel->parms.link; +} +EXPORT_SYMBOL(ip_tunnel_get_iflink); + int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, struct rtnl_link_ops *ops, char *devname) { |