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

git-mirror · Jan 14, 2006 · a148058 · a148058
2 parents fb7ffeb + 37d8dc8
commit a148058
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
@@ -8,6 +8,7 @@
 
 #include <linux/module.h>
 #include <linux/skbuff.h>
+#include <linux/ipv6.h>
 #include <net/ip.h>
 
 #include <linux/netfilter/xt_length.h>

diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <net/ip.h>
+#include <linux/ipv6.h>
 #include <net/ipv6.h>
 #include <net/tcp.h>
 #include <net/udp.h>