Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03eb128 authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

gre6: Move the setting of dev->iflink into the ndo_init functions. 



Otherwise it gets overwritten by register_netdev().

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebe084aa

net/ipv6/ip6_gre.c

+3 −2
Original line number Diff line number Diff line
@@ -961,8 +961,6 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu) 
	else

		dev->flags &= ~IFF_POINTOPOINT;



	dev->iflink = p->link;



	/* Precalculate GRE options length */

	if (t->parms.o_flags&(GRE_CSUM|GRE_KEY|GRE_SEQ)) {

		if (t->parms.o_flags&GRE_CSUM)
@@ -1272,6 +1270,7 @@ static int ip6gre_tunnel_init(struct net_device *dev) 
		u64_stats_init(&ip6gre_tunnel_stats->syncp);

	}



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



	return 0;

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

		return -ENOMEM;



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



	return 0;

}