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

a148058c · Linus Torvalds · fb7ffeb1 · 37d8dc82 · a148058c · a148058c
Commit a148058c authored Jan 13, 2006 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

net/netfilter/xt_length.c net/netfilter/xt_length.c +1 -0

net/netfilter/xt_tcpudp.c net/netfilter/xt_tcpudp.c +1 -0

No files found.
--- 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>

--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
 #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>