summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2009-03-18 18:56:54 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-18 18:56:54 -0700
commit1b1d8f73a44fe1796a73a97ebcb08cad18b97f07 (patch)
tree620b65aeb1d540047cd06375dc682441f36ca2c5 /net
parente9c6a586f5335938b11be0a2554af58a2860e4ef (diff)
downloadlinux-1b1d8f73a44fe1796a73a97ebcb08cad18b97f07.tar.bz2
ipv6: fix display of local and remote sit endpoints
This fixes the regressions cause by commit 1326c3d5a4b792a2b15877feb7fb691f8945d203 (v2.6.28-rc6-461-g23a12b1) broke the display of local and remote addresses of an SIT tunnel in iproute2. nt->parms is used by ipip6_tunnel_init() and therefore need to be initialized first. Tracked as http://bugzilla.kernel.org/show_bug.cgi?id=12868 Reported-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/sit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index d3467e563f02..5cee2bcbcece 100644
--- a/net/ipv6/sit.c
+++ b/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;