Skip to content

Commit

Permalink
ipv6: fix display of local and remote sit endpoints
Browse files Browse the repository at this point in the history
This fixes the regressions cause by
commit 1326c3d
(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>
  • Loading branch information
Bjørn Mork authored and David S. Miller committed Mar 19, 2009
1 parent e9c6a58 commit 1b1d8f7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ipv6/sit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1b1d8f7

Please sign in to comment.