From 9324dc023baedc9a17fd9dab4a848335109b6e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Wed, 18 Mar 2009 18:56:54 -0700
Subject: [PATCH] --- yaml --- r: 132540 b: refs/heads/master c:
 1b1d8f73a44fe1796a73a97ebcb08cad18b97f07 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv6/sit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1a1d83070c47..30557feda980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9c6a586f5335938b11be0a2554af58a2860e4ef
+refs/heads/master: 1b1d8f73a44fe1796a73a97ebcb08cad18b97f07
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
index d3467e563f02..5cee2bcbcece 100644
--- a/trunk/net/ipv6/sit.c
+++ b/trunk/net/ipv6/sit.c
@@ -188,9 +188,9 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
 	}
 
 	nt = netdev_priv(dev);
-	ipip6_tunnel_init(dev);
 
 	nt->parms = *parms;
+	ipip6_tunnel_init(dev);
 
 	if (parms->i_flags & SIT_ISATAP)
 		dev->priv_flags |= IFF_ISATAP;