diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 20:13:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-13 20:13:44 -0500 |
| commit | a148058c5cf72ad23fb6c4cf9828f7276e13151c (patch) | |
| tree | daa700d2c2940934b02923f8595753e59315146a | |
| parent | fb7ffeb11bb7e9e75dc83ff67a4925c270e0fa3c (diff) | |
| parent | 37d8dc82e0cd93eec77c5bcebd725c4ba661351a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/netfilter/xt_length.c | 1 | ||||
| -rw-r--r-- | net/netfilter/xt_tcpudp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c index ab6c710cf88f..39c8faea63de 100644 --- a/net/netfilter/xt_length.c +++ b/net/netfilter/xt_length.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/skbuff.h> | 10 | #include <linux/skbuff.h> |
| 11 | #include <linux/ipv6.h> | ||
| 11 | #include <net/ip.h> | 12 | #include <net/ip.h> |
| 12 | 13 | ||
| 13 | #include <linux/netfilter/xt_length.h> | 14 | #include <linux/netfilter/xt_length.h> |
diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c index 33f86fd6f3e6..669c8113cc60 100644 --- a/net/netfilter/xt_tcpudp.c +++ b/net/netfilter/xt_tcpudp.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 3 | #include <net/ip.h> | 3 | #include <net/ip.h> |
| 4 | #include <linux/ipv6.h> | ||
| 4 | #include <net/ipv6.h> | 5 | #include <net/ipv6.h> |
| 5 | #include <net/tcp.h> | 6 | #include <net/tcp.h> |
| 6 | #include <net/udp.h> | 7 | #include <net/udp.h> |