summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-09-05 13:55:27 +0000
committerPatrick McHardy <kaber@trash.net>2007-09-05 13:55:27 +0000
commit7a87b74d4d41a356df3a81d0e8415c4f7a76097b (patch)
treea61e409f3e45d61930a7c06eb252bcc4d990e12d
parentb4a6920d4bb9fa634279c93b9d2cc543603ea772 (diff)
Resync header file and build IPv6 ah match unconditionally
-rwxr-xr-xextensions/.ah-test62
-rw-r--r--extensions/Makefile2
-rw-r--r--include/linux/netfilter_ipv6/ip6t_ah.h9
3 files changed, 1 insertions, 12 deletions
diff --git a/extensions/.ah-test6 b/extensions/.ah-test6
deleted file mode 100755
index 1812c56d..00000000
--- a/extensions/.ah-test6
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_ah.c -a -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_ah.h ] && echo ah
diff --git a/extensions/Makefile b/extensions/Makefile
index b36dd4d3..7ba1efbd 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:=eui64 hl icmp6 owner policy HL LOG REJECT
+PF6_EXT_SLIB:=ah eui64 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_ah.h b/include/linux/netfilter_ipv6/ip6t_ah.h
index c4f0793a..8531879e 100644
--- a/include/linux/netfilter_ipv6/ip6t_ah.h
+++ b/include/linux/netfilter_ipv6/ip6t_ah.h
@@ -18,13 +18,4 @@ struct ip6t_ah
#define IP6T_AH_INV_LEN 0x02 /* Invert the sense of length. */
#define IP6T_AH_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_AH_H*/