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;