forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	drivers/net/virtio_net.c
This commit is contained in:
David S. Miller 2009-03-20 02:27:41 -07:00
commit 2b1c4354de
14 changed files with 108 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv6/sit.c
View file

@ -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;