From 77b4e5febe70e403dbfb9515396cc743a26094a0 Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Tue, 17 Jan 2006 02:39:19 -0800
Subject: [PATCH] --- yaml --- r: 18751 b: refs/heads/master c:
 e0069caede8387c585060b7e2e87729e9efcebc6 h: refs/heads/master i:   18749:
 01ae6f66e70cf7db2abfc61ca1f7459ac21e2009   18747:
 8d1c27681b3f08dacfa3f9c3e95317f6b6c388e7   18743:
 6d92fc7de2cecc7e5b7dfc74733791a312bffd19   18735:
 8b4ac4700a806ef8189ace5e8660eaad5f606d57   18719:
 7b8a20c02a83b05e877830e7c2777a81fe416dfa   18687:
 f6446abd0a6fc05d7ca01de4198e1b6e6f61aba7 v: v3

---
 [refs]                                         | 2 +-
 trunk/include/linux/netfilter_ipv6/ip6t_ah.h   | 9 ---------
 trunk/include/linux/netfilter_ipv6/ip6t_esp.h  | 9 ---------
 trunk/include/linux/netfilter_ipv6/ip6t_frag.h | 9 ---------
 trunk/include/linux/netfilter_ipv6/ip6t_opts.h | 9 ---------
 trunk/include/linux/netfilter_ipv6/ip6t_rt.h   | 9 ---------
 6 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/[refs] b/[refs]
index b19599c61418..ac5604f1cb66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dd42af7904336c6f59a01f9fd3599ee650e78ed
+refs/heads/master: e0069caede8387c585060b7e2e87729e9efcebc6
diff --git a/trunk/include/linux/netfilter_ipv6/ip6t_ah.h b/trunk/include/linux/netfilter_ipv6/ip6t_ah.h
index c4f0793a0a98..8531879eb464 100644
--- a/trunk/include/linux/netfilter_ipv6/ip6t_ah.h
+++ b/trunk/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*/
diff --git a/trunk/include/linux/netfilter_ipv6/ip6t_esp.h b/trunk/include/linux/netfilter_ipv6/ip6t_esp.h
index 01142b98a231..a91b6abc8079 100644
--- a/trunk/include/linux/netfilter_ipv6/ip6t_esp.h
+++ b/trunk/include/linux/netfilter_ipv6/ip6t_esp.h
@@ -7,15 +7,6 @@ struct ip6t_esp
 	u_int8_t  invflags;			/* Inverse 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
-
 /* Values for "invflags" field in struct ip6t_esp. */
 #define IP6T_ESP_INV_SPI		0x01	/* Invert the sense of spi. */
 #define IP6T_ESP_INV_MASK	0x01	/* All possible flags. */
diff --git a/trunk/include/linux/netfilter_ipv6/ip6t_frag.h b/trunk/include/linux/netfilter_ipv6/ip6t_frag.h
index 449a57eca7dd..66070a0d6dfc 100644
--- a/trunk/include/linux/netfilter_ipv6/ip6t_frag.h
+++ b/trunk/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*/
diff --git a/trunk/include/linux/netfilter_ipv6/ip6t_opts.h b/trunk/include/linux/netfilter_ipv6/ip6t_opts.h
index e259b6275bd2..a07e36380ae8 100644
--- a/trunk/include/linux/netfilter_ipv6/ip6t_opts.h
+++ b/trunk/include/linux/netfilter_ipv6/ip6t_opts.h
@@ -20,13 +20,4 @@ struct ip6t_opts
 #define IP6T_OPTS_INV_LEN	0x01	/* Invert the sense of length. */
 #define IP6T_OPTS_INV_MASK	0x01	/* 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_OPTS_H*/
diff --git a/trunk/include/linux/netfilter_ipv6/ip6t_rt.h b/trunk/include/linux/netfilter_ipv6/ip6t_rt.h
index f1070fbf2757..52156023e8db 100644
--- a/trunk/include/linux/netfilter_ipv6/ip6t_rt.h
+++ b/trunk/include/linux/netfilter_ipv6/ip6t_rt.h
@@ -30,13 +30,4 @@ struct ip6t_rt
 #define IP6T_RT_INV_LEN		0x04	/* Invert the sense of length. */
 #define IP6T_RT_INV_MASK	0x07	/* 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_RT_H*/