diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 12:05:57 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 12:05:57 (GMT) |
commit | d040c1614c24162adc3fe106b182596999264e26 (patch) | |
tree | 5af02052e633bcde0e33f77cac52ab4685ad07f1 /net/ipv6/ip6_tunnel.c | |
parent | d88316c243e5458a1888edbe0353c4dec6e61c73 (diff) | |
parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) | |
download | linux-fsl-qoriq-d040c1614c24162adc3fe106b182596999264e26.tar.xz |
Merge branch 'x86/core' into x86/headers
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 58e2b0d..d994c55 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -249,8 +249,8 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct ip6_tnl_parm *p) } t = netdev_priv(dev); - ip6_tnl_dev_init(dev); t->parms = *p; + ip6_tnl_dev_init(dev); if ((err = register_netdevice(dev)) < 0) goto failed_free; |