Commit 5a1b7e1a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

ip: use dev_addr_set() in tunnels 



Use dev_addr_set() instead of writing to netdev->dev_addr
directly in ip tunnels drivers.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 20c3d9e4

net/ipv4/ip_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static int ipgre_tunnel_init(struct net_device *dev) 


	__gre_tunnel_init(dev);



	memcpy(dev->dev_addr, &iph->saddr, 4);

	__dev_addr_set(dev, &iph->saddr, 4);

	memcpy(dev->broadcast, &iph->daddr, 4);



	dev->flags		= IFF_NOARP;

net/ipv4/ip_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static void ip_tunnel_update(struct ip_tunnel_net *itn, 
	t->parms.i_key = p->i_key;

	t->parms.o_key = p->o_key;

	if (dev->type != ARPHRD_ETHER) {

		memcpy(dev->dev_addr, &p->iph.saddr, 4);

		__dev_addr_set(dev, &p->iph.saddr, 4);

		memcpy(dev->broadcast, &p->iph.daddr, 4);

	}

	ip_tunnel_add(itn, t);

net/ipv4/ip_vti.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int vti_tunnel_init(struct net_device *dev) 
	struct ip_tunnel *tunnel = netdev_priv(dev);

	struct iphdr *iph = &tunnel->parms.iph;



	memcpy(dev->dev_addr, &iph->saddr, 4);

	__dev_addr_set(dev, &iph->saddr, 4);

	memcpy(dev->broadcast, &iph->daddr, 4);



	dev->flags		= IFF_NOARP;

net/ipv4/ipip.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static int ipip_tunnel_init(struct net_device *dev) 
{

	struct ip_tunnel *tunnel = netdev_priv(dev);



	memcpy(dev->dev_addr, &tunnel->parms.iph.saddr, 4);

	__dev_addr_set(dev, &tunnel->parms.iph.saddr, 4);

	memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4);



	tunnel->tun_hlen = 0;

net/ipv6/ip6_gre.c

+2 −2
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ static void ip6gre_tnl_link_config_common(struct ip6_tnl *t) 
	struct flowi6 *fl6 = &t->fl.u.ip6;



	if (dev->type != ARPHRD_ETHER) {

		memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr));

		__dev_addr_set(dev, &p->laddr, sizeof(struct in6_addr));

		memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr));

	}
@@ -1521,7 +1521,7 @@ static int ip6gre_tunnel_init(struct net_device *dev) 
	if (tunnel->parms.collect_md)

		return 0;



	memcpy(dev->dev_addr, &tunnel->parms.laddr, sizeof(struct in6_addr));

	__dev_addr_set(dev, &tunnel->parms.laddr, sizeof(struct in6_addr));

	memcpy(dev->broadcast, &tunnel->parms.raddr, sizeof(struct in6_addr));



	if (ipv6_addr_any(&tunnel->parms.raddr))