Commit 1b1d8f73 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller

ipv6: fix display of local and remote sit endpoints

This fixes the regressions cause by
commit 1326c3d5
(v2.6.28-rc6-461-g23a12b14) 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=12868Reported-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9c6a586
...@@ -188,9 +188,9 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net, ...@@ -188,9 +188,9 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
} }
nt = netdev_priv(dev); nt = netdev_priv(dev);
ipip6_tunnel_init(dev);
nt->parms = *parms; nt->parms = *parms;
ipip6_tunnel_init(dev);
if (parms->i_flags & SIT_ISATAP) if (parms->i_flags & SIT_ISATAP)
dev->priv_flags |= IFF_ISATAP; dev->priv_flags |= IFF_ISATAP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment