Commit ecf2c06a authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ip6tnl,gre6,vti6: implement ndo_get_iflink 



Don't use dev->iflink anymore.

CC: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a54acb3a

include/net/ip6_tunnel.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw); 
__u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr,

			     const struct in6_addr *raddr);

struct net *ip6_tnl_get_link_net(const struct net_device *dev);

int ip6_tnl_get_iflink(const struct net_device *dev);



static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

{

net/ipv6/ip6_gre.c

+2 −6
Original line number Diff line number Diff line
@@ -1216,6 +1216,7 @@ static const struct net_device_ops ip6gre_netdev_ops = { 
	.ndo_do_ioctl		= ip6gre_tunnel_ioctl,

	.ndo_change_mtu		= ip6gre_tunnel_change_mtu,

	.ndo_get_stats64	= ip_tunnel_get_stats64,

	.ndo_get_iflink		= ip6_tnl_get_iflink,

};



static void ip6gre_dev_free(struct net_device *dev)
@@ -1238,7 +1239,6 @@ static void ip6gre_tunnel_setup(struct net_device *dev) 
	if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT))

		dev->mtu -= 8;

	dev->flags |= IFF_NOARP;

	dev->iflink = 0;

	dev->addr_len = sizeof(struct in6_addr);

	netif_keep_dst(dev);

}
@@ -1270,8 +1270,6 @@ static int ip6gre_tunnel_init(struct net_device *dev) 
		u64_stats_init(&ip6gre_tunnel_stats->syncp);

	}



	dev->iflink = tunnel->parms.link;



	return 0;

}
@@ -1480,8 +1478,6 @@ static int ip6gre_tap_init(struct net_device *dev) 
	if (!dev->tstats)

		return -ENOMEM;



	dev->iflink = tunnel->parms.link;



	return 0;

}
@@ -1493,6 +1489,7 @@ static const struct net_device_ops ip6gre_tap_netdev_ops = { 
	.ndo_validate_addr = eth_validate_addr,

	.ndo_change_mtu = ip6gre_tunnel_change_mtu,

	.ndo_get_stats64 = ip_tunnel_get_stats64,

	.ndo_get_iflink = ip6_tnl_get_iflink,

};



static void ip6gre_tap_setup(struct net_device *dev)
@@ -1503,7 +1500,6 @@ static void ip6gre_tap_setup(struct net_device *dev) 
	dev->netdev_ops = &ip6gre_tap_netdev_ops;

	dev->destructor = ip6gre_dev_free;



	dev->iflink = 0;

	dev->features |= NETIF_F_NETNS_LOCAL;

}

net/ipv6/ip6_tunnel.c

+8 −2
Original line number Diff line number Diff line
@@ -1264,8 +1264,6 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) 
	else

		dev->flags &= ~IFF_POINTOPOINT;



	dev->iflink = p->link;



	if (p->flags & IP6_TNL_F_CAP_XMIT) {

		int strict = (ipv6_addr_type(&p->raddr) &

			      (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL));
@@ -1517,6 +1515,13 @@ ip6_tnl_change_mtu(struct net_device *dev, int new_mtu) 
	return 0;

}



int ip6_tnl_get_iflink(const struct net_device *dev)

{

	struct ip6_tnl *t = netdev_priv(dev);



	return t->parms.link;

}

EXPORT_SYMBOL(ip6_tnl_get_iflink);



static const struct net_device_ops ip6_tnl_netdev_ops = {

	.ndo_init	= ip6_tnl_dev_init,
@@ -1525,6 +1530,7 @@ static const struct net_device_ops ip6_tnl_netdev_ops = { 
	.ndo_do_ioctl	= ip6_tnl_ioctl,

	.ndo_change_mtu = ip6_tnl_change_mtu,

	.ndo_get_stats	= ip6_get_stats,

	.ndo_get_iflink = ip6_tnl_get_iflink,

};

net/ipv6/ip6_vti.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

};



/**