Browse Source

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

Linus Torvalds 19 years ago
parent
commit
a148058c5c
2 changed files with 2 additions and 0 deletions
  1. 1 0
      net/netfilter/xt_length.c
  2. 1 0
      net/netfilter/xt_tcpudp.c

+ 1 - 0
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>

+ 1 - 0
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>