lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	drivers/net/Kconfig
This commit is contained in:
David S. Miller
2009-02-03 00:15:35 -08:00
parent 1bded710a5 fb53fde976
commit b3ff29d2cc
583 changed files with 14384 additions and 6099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv6/ip6mr.c
View File

@@ -48,6 +48,7 @@
#include <linux/pim.h>
#include <net/addrconf.h>
#include <linux/netfilter_ipv6.h>
#include <net/ip6_checksum.h>
/* Big lock, protecting vif table, mrt cache and mroute socket state.
Note that the changes are semaphored via rtnl_lock.