diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2014-11-03 09:19:30 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-03 15:42:24 -0500 |
| commit | f03eb128e3f4276f46442d14f3b8f864f3775821 (patch) | |
| tree | f70dc113b3c7946819f2f2829cb696159bea8cec /net/ipv6/ip6_gre.c | |
| parent | ebe084aafb7e93adf210e80043c9f69adf56820d (diff) | |
| download | talos-obmc-linux-f03eb128e3f4276f46442d14f3b8f864f3775821.tar.gz talos-obmc-linux-f03eb128e3f4276f46442d14f3b8f864f3775821.zip | |
gre6: Move the setting of dev->iflink into the ndo_init functions.
Otherwise it gets overwritten by register_netdev().
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 12c3c8ef3849..4564e1fca3eb 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -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; } |
