diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 05:27:41 -0400 |
| commit | 2b1c4354de72ced917d2f3fe88117613f992234b (patch) | |
| tree | 3e7643cad45d94e3c331366418532043bd4fa5a9 /net/ipv6/sit.c | |
| parent | 5e140dfc1fe87eae27846f193086724806b33c7d (diff) | |
| parent | 170ebf85160dd128e1c4206cc197cce7d1424705 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/virtio_net.c
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 26915effb3b..664ab82e03b 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, | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | nt = netdev_priv(dev); | 190 | nt = netdev_priv(dev); |
| 191 | ipip6_tunnel_init(dev); | ||
| 192 | 191 | ||
| 193 | nt->parms = *parms; | 192 | nt->parms = *parms; |
| 193 | ipip6_tunnel_init(dev); | ||
| 194 | 194 | ||
| 195 | if (parms->i_flags & SIT_ISATAP) | 195 | if (parms->i_flags & SIT_ISATAP) |
| 196 | dev->priv_flags |= IFF_ISATAP; | 196 | dev->priv_flags |= IFF_ISATAP; |