From 57ce068dd2ebec70249f031ed94f3d73e88414b9 Mon Sep 17 00:00:00 2001 From: "/C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org" Date: Sat, 4 Aug 2007 08:06:55 +0000 Subject: Unifies libip[6]t_MARK into libxt_MARK --- include/linux/netfilter/xt_MARK.h | 21 +++++++++++++++++++++ include/linux/netfilter_ipv4/ipt_MARK.h | 19 ------------------- include/linux/netfilter_ipv6/ip6t_MARK.h | 8 -------- 3 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 include/linux/netfilter/xt_MARK.h delete mode 100644 include/linux/netfilter_ipv4/ipt_MARK.h delete mode 100644 include/linux/netfilter_ipv6/ip6t_MARK.h (limited to 'include') diff --git a/include/linux/netfilter/xt_MARK.h b/include/linux/netfilter/xt_MARK.h new file mode 100644 index 0000000..b021e93 --- /dev/null +++ b/include/linux/netfilter/xt_MARK.h @@ -0,0 +1,21 @@ +#ifndef _XT_MARK_H_target +#define _XT_MARK_H_target + +/* Version 0 */ +struct xt_mark_target_info { + unsigned long mark; +}; + +/* Version 1 */ +enum { + XT_MARK_SET=0, + XT_MARK_AND, + XT_MARK_OR, +}; + +struct xt_mark_target_info_v1 { + unsigned long mark; + u_int8_t mode; +}; + +#endif /*_XT_MARK_H_target */ diff --git a/include/linux/netfilter_ipv4/ipt_MARK.h b/include/linux/netfilter_ipv4/ipt_MARK.h deleted file mode 100644 index 1b6502f..0000000 --- a/include/linux/netfilter_ipv4/ipt_MARK.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _IPT_MARK_H_target -#define _IPT_MARK_H_target - -struct ipt_mark_target_info { - unsigned long mark; -}; - -enum { - IPT_MARK_SET=0, - IPT_MARK_AND, - IPT_MARK_OR -}; - -struct ipt_mark_target_info_v1 { - unsigned long mark; - u_int8_t mode; -}; - -#endif /*_IPT_MARK_H_target*/ diff --git a/include/linux/netfilter_ipv6/ip6t_MARK.h b/include/linux/netfilter_ipv6/ip6t_MARK.h deleted file mode 100644 index 7ade8d8..0000000 --- a/include/linux/netfilter_ipv6/ip6t_MARK.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IP6T_MARK_H_target -#define _IP6T_MARK_H_target - -struct ip6t_mark_target_info { - unsigned long mark; -}; - -#endif /*_IPT_MARK_H_target*/ -- cgit v1.2.3