summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-09-05 13:56:30 +0000
committerPatrick McHardy <kaber@trash.net>2007-09-05 13:56:30 +0000
commiteda0390fe200f2d9f37d2a19b50e7ca531367ada (patch)
tree130ddea2936d02d58de6c676dbe62382f7ac3e86
parent7a87b74d4d41a356df3a81d0e8415c4f7a76097b (diff)
Resync header files and build IPv6 frag match unconditionally
-rwxr-xr-xextensions/.frag-test62
-rw-r--r--extensions/Makefile2
-rw-r--r--include/linux/netfilter_ipv6/ip6t_frag.h9
3 files changed, 1 insertions, 12 deletions
diff --git a/extensions/.frag-test6 b/extensions/.frag-test6
deleted file mode 100755
index ff3650df..00000000
--- a/extensions/.frag-test6
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_frag.c -a -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_frag.h ] && echo frag
diff --git a/extensions/Makefile b/extensions/Makefile
index 7ba1efbd..68ea8677 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -6,7 +6,7 @@
# package (HW)
#
PF_EXT_SLIB:=ah addrtype conntrack ecn icmp iprange owner policy realm recent tos ttl unclean CLUSTERIP DNAT ECN LOG MASQUERADE MIRROR NETMAP REDIRECT REJECT SAME SNAT TOS TTL ULOG
-PF6_EXT_SLIB:=ah eui64 hl icmp6 owner policy HL LOG REJECT
+PF6_EXT_SLIB:=ah eui64 frag hl icmp6 owner policy HL LOG REJECT
PFX_EXT_SLIB:=connbytes connmark connlimit comment dccp dscp esp hashlimit helper length limit mac mark multiport physdev pkttype quota sctp state statistic standard string tcp tcpmss udp CLASSIFY CONNMARK DSCP MARK NFLOG NFQUEUE NOTRACK TCPMSS TRACE
ifeq ($(DO_SELINUX), 1)
diff --git a/include/linux/netfilter_ipv6/ip6t_frag.h b/include/linux/netfilter_ipv6/ip6t_frag.h
index 449a57ec..66070a0d 100644
--- a/include/linux/netfilter_ipv6/ip6t_frag.h
+++ b/include/linux/netfilter_ipv6/ip6t_frag.h
@@ -21,13 +21,4 @@ struct ip6t_frag
#define IP6T_FRAG_INV_LEN 0x02 /* Invert the sense of length. */
#define IP6T_FRAG_INV_MASK 0x03 /* All possible flags. */
-#define MASK_HOPOPTS 128
-#define MASK_DSTOPTS 64
-#define MASK_ROUTING 32
-#define MASK_FRAGMENT 16
-#define MASK_AH 8
-#define MASK_ESP 4
-#define MASK_NONE 2
-#define MASK_PROTO 1
-
#endif /*_IP6T_FRAG_H*/