* [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h @ 2012-02-03 5:40 Cong Wang 2012-02-03 5:40 ` [PATCH 2/2] netfilter: remove rev 0 of xt_connlimit Cong Wang 2012-02-03 8:15 ` [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Florian Westphal 0 siblings, 2 replies; 7+ messages in thread From: Cong Wang @ 2012-02-03 5:40 UTC (permalink / raw) To: netdev; +Cc: netfilter-devel, Cong Wang, David S. Miller, Florian Westphal Cc: "David S. Miller" <davem@davemloft.net> Cc: Florian Westphal <fw@strlen.de> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> --- Documentation/feature-removal-schedule.txt | 8 -------- include/linux/netfilter_ipv4/Kbuild | 1 - include/linux/netfilter_ipv4/ipt_addrtype.h | 27 --------------------------- 3 files changed, 0 insertions(+), 36 deletions(-) delete mode 100644 include/linux/netfilter_ipv4/ipt_addrtype.h diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index a0ffac0..830a0b9 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -422,14 +422,6 @@ Files: net/netfilter/xt_connlimit.c ---------------------------- -What: ipt_addrtype match include file -When: 2012 -Why: superseded by xt_addrtype -Who: Florian Westphal <fw@strlen.de> -Files: include/linux/netfilter_ipv4/ipt_addrtype.h - ----------------------------- - What: i2c_driver.attach_adapter i2c_driver.detach_adapter When: September 2011 diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild index f9930c8..8e6362b 100644 --- a/include/linux/netfilter_ipv4/Kbuild +++ b/include/linux/netfilter_ipv4/Kbuild @@ -7,7 +7,6 @@ header-y += ipt_REJECT.h header-y += ipt_SAME.h header-y += ipt_TTL.h header-y += ipt_ULOG.h -header-y += ipt_addrtype.h header-y += ipt_ah.h header-y += ipt_ecn.h header-y += ipt_realm.h diff --git a/include/linux/netfilter_ipv4/ipt_addrtype.h b/include/linux/netfilter_ipv4/ipt_addrtype.h deleted file mode 100644 index 0da4223..0000000 --- a/include/linux/netfilter_ipv4/ipt_addrtype.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef _IPT_ADDRTYPE_H -#define _IPT_ADDRTYPE_H - -#include <linux/types.h> - -enum { - IPT_ADDRTYPE_INVERT_SOURCE = 0x0001, - IPT_ADDRTYPE_INVERT_DEST = 0x0002, - IPT_ADDRTYPE_LIMIT_IFACE_IN = 0x0004, - IPT_ADDRTYPE_LIMIT_IFACE_OUT = 0x0008, -}; - -struct ipt_addrtype_info_v1 { - __u16 source; /* source-type mask */ - __u16 dest; /* dest-type mask */ - __u32 flags; -}; - -/* revision 0 */ -struct ipt_addrtype_info { - __u16 source; /* source-type mask */ - __u16 dest; /* dest-type mask */ - __u32 invert_source; - __u32 invert_dest; -}; - -#endif -- 1.7.7.6 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] netfilter: remove rev 0 of xt_connlimit 2012-02-03 5:40 [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Cong Wang @ 2012-02-03 5:40 ` Cong Wang 2012-02-03 8:15 ` [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Florian Westphal 1 sibling, 0 replies; 7+ messages in thread From: Cong Wang @ 2012-02-03 5:40 UTC (permalink / raw) To: netdev; +Cc: netfilter-devel, Cong Wang, David S. Miller, Jan Engelhardt Cc: "David S. Miller" <davem@davemloft.net> Cc: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> --- Documentation/feature-removal-schedule.txt | 7 ----- include/linux/netfilter/xt_connlimit.h | 9 +----- net/netfilter/xt_connlimit.c | 35 ++++++++------------------- 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 830a0b9..4e1d8de 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -415,13 +415,6 @@ Who: Jean Delvare <khali@linux-fr.org> ---------------------------- -What: xt_connlimit rev 0 -When: 2012 -Who: Jan Engelhardt <jengelh@medozas.de> -Files: net/netfilter/xt_connlimit.c - ----------------------------- - What: i2c_driver.attach_adapter i2c_driver.detach_adapter When: September 2011 diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h index d1366f0..f165609 100644 --- a/include/linux/netfilter/xt_connlimit.h +++ b/include/linux/netfilter/xt_connlimit.h @@ -22,13 +22,8 @@ struct xt_connlimit_info { #endif }; unsigned int limit; - union { - /* revision 0 */ - unsigned int inverse; - - /* revision 1 */ - __u32 flags; - }; + /* revision 1 */ + __u32 flags; /* Used internally by the kernel */ struct xt_connlimit_data *data __attribute__((aligned(8))); diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index c6d5a83..70b5591 100644 --- a/net/netfilter/xt_connlimit.c +++ b/net/netfilter/xt_connlimit.c @@ -274,38 +274,25 @@ static void connlimit_mt_destroy(const struct xt_mtdtor_param *par) kfree(info->data); } -static struct xt_match connlimit_mt_reg[] __read_mostly = { - { - .name = "connlimit", - .revision = 0, - .family = NFPROTO_UNSPEC, - .checkentry = connlimit_mt_check, - .match = connlimit_mt, - .matchsize = sizeof(struct xt_connlimit_info), - .destroy = connlimit_mt_destroy, - .me = THIS_MODULE, - }, - { - .name = "connlimit", - .revision = 1, - .family = NFPROTO_UNSPEC, - .checkentry = connlimit_mt_check, - .match = connlimit_mt, - .matchsize = sizeof(struct xt_connlimit_info), - .destroy = connlimit_mt_destroy, - .me = THIS_MODULE, - }, +static struct xt_match connlimit_mt_reg __read_mostly = { + .name = "connlimit", + .revision = 1, + .family = NFPROTO_UNSPEC, + .checkentry = connlimit_mt_check, + .match = connlimit_mt, + .matchsize = sizeof(struct xt_connlimit_info), + .destroy = connlimit_mt_destroy, + .me = THIS_MODULE, }; static int __init connlimit_mt_init(void) { - return xt_register_matches(connlimit_mt_reg, - ARRAY_SIZE(connlimit_mt_reg)); + return xt_register_match(&connlimit_mt_reg); } static void __exit connlimit_mt_exit(void) { - xt_unregister_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg)); + xt_unregister_match(&connlimit_mt_reg); } module_init(connlimit_mt_init); -- 1.7.7.6 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h 2012-02-03 5:40 [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Cong Wang 2012-02-03 5:40 ` [PATCH 2/2] netfilter: remove rev 0 of xt_connlimit Cong Wang @ 2012-02-03 8:15 ` Florian Westphal 2012-02-03 10:02 ` [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too Cong Wang 1 sibling, 1 reply; 7+ messages in thread From: Florian Westphal @ 2012-02-03 8:15 UTC (permalink / raw) To: Cong Wang; +Cc: netdev, netfilter-devel, David S. Miller, Florian Westphal Cong Wang <xiyou.wangcong@gmail.com> wrote: > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Florian Westphal <fw@strlen.de> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> > > --- > Documentation/feature-removal-schedule.txt | 8 -------- > include/linux/netfilter_ipv4/Kbuild | 1 - > include/linux/netfilter_ipv4/ipt_addrtype.h | 27 --------------------------- > 3 files changed, 0 insertions(+), 36 deletions(-) > delete mode 100644 include/linux/netfilter_ipv4/ipt_addrtype.h I'm fine with this going into nf-next, so Acked-By: Florian Westphal <fw@strlen.de> note that include/linux/netfilter_ipv4/ipt_realm.h include/linux/netfilter_ipv4/ipt_SAME.h could be removed, too. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too 2012-02-03 8:15 ` [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Florian Westphal @ 2012-02-03 10:02 ` Cong Wang 2012-02-27 6:17 ` Cong Wang 0 siblings, 1 reply; 7+ messages in thread From: Cong Wang @ 2012-02-03 10:02 UTC (permalink / raw) To: netdev; +Cc: netfilter-devel, David S. Miller, Florian Westphal, WANG Cong As Florian pointed out, these 2 headers can be removed too. Cc: "David S. Miller" <davem@davemloft.net> Cc: Florian Westphal <fw@strlen.de> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> --- diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild index 8e6362b..5ec78b6 100644 --- a/include/linux/netfilter_ipv4/Kbuild +++ b/include/linux/netfilter_ipv4/Kbuild @@ -4,10 +4,8 @@ header-y += ipt_CLUSTERIP.h header-y += ipt_ECN.h header-y += ipt_LOG.h header-y += ipt_REJECT.h -header-y += ipt_SAME.h header-y += ipt_TTL.h header-y += ipt_ULOG.h header-y += ipt_ah.h header-y += ipt_ecn.h -header-y += ipt_realm.h header-y += ipt_ttl.h diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter_ipv4/ipt_SAME.h deleted file mode 100644 index 5bca782..0000000 --- a/include/linux/netfilter_ipv4/ipt_SAME.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _IPT_SAME_H -#define _IPT_SAME_H - -#include <linux/types.h> - -#define IPT_SAME_MAX_RANGE 10 - -#define IPT_SAME_NODST 0x01 - -struct ipt_same_info { - unsigned char info; - __u32 rangesize; - __u32 ipnum; - __u32 *iparray; - - /* hangs off end. */ - struct nf_nat_range range[IPT_SAME_MAX_RANGE]; -}; - -#endif /*_IPT_SAME_H*/ diff --git a/include/linux/netfilter_ipv4/ipt_realm.h b/include/linux/netfilter_ipv4/ipt_realm.h deleted file mode 100644 index b3996ea..0000000 --- a/include/linux/netfilter_ipv4/ipt_realm.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _IPT_REALM_H -#define _IPT_REALM_H - -#include <linux/netfilter/xt_realm.h> -#define ipt_realm_info xt_realm_info - -#endif /* _IPT_REALM_H */ ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too 2012-02-03 10:02 ` [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too Cong Wang @ 2012-02-27 6:17 ` Cong Wang 2012-02-27 17:40 ` Jan Ceuleers 2012-02-29 3:08 ` Pablo Neira Ayuso 0 siblings, 2 replies; 7+ messages in thread From: Cong Wang @ 2012-02-27 6:17 UTC (permalink / raw) To: netdev; +Cc: netfilter-devel On Fri, 03 Feb 2012 at 10:02 GMT, Cong Wang <xiyou.wangcong@gmail.com> wrote: > As Florian pointed out, these 2 headers can be removed too. > > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Florian Westphal <fw@strlen.de> > Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> > Ping... What is the status of this patch? Thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too 2012-02-27 6:17 ` Cong Wang @ 2012-02-27 17:40 ` Jan Ceuleers 2012-02-29 3:08 ` Pablo Neira Ayuso 1 sibling, 0 replies; 7+ messages in thread From: Jan Ceuleers @ 2012-02-27 17:40 UTC (permalink / raw) To: Cong Wang; +Cc: netdev, netfilter-devel On 02/27/2012 07:17 AM, Cong Wang wrote: > On Fri, 03 Feb 2012 at 10:02 GMT, Cong Wang<xiyou.wangcong@gmail.com> wrote: >> As Florian pointed out, these 2 headers can be removed too. >> >> Cc: "David S. Miller"<davem@davemloft.net> >> Cc: Florian Westphal<fw@strlen.de> >> Signed-off-by: WANG Cong<xiyou.wangcong@gmail.com> >> > Ping... > > What is the status of this patch? > It has been marked Not Applicable: http://patchwork.ozlabs.org/patch/139337/ ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too 2012-02-27 6:17 ` Cong Wang 2012-02-27 17:40 ` Jan Ceuleers @ 2012-02-29 3:08 ` Pablo Neira Ayuso 1 sibling, 0 replies; 7+ messages in thread From: Pablo Neira Ayuso @ 2012-02-29 3:08 UTC (permalink / raw) To: Cong Wang; +Cc: netdev, netfilter-devel On Mon, Feb 27, 2012 at 06:17:57AM +0000, Cong Wang wrote: > On Fri, 03 Feb 2012 at 10:02 GMT, Cong Wang <xiyou.wangcong@gmail.com> wrote: > > As Florian pointed out, these 2 headers can be removed too. > > > > Cc: "David S. Miller" <davem@davemloft.net> > > Cc: Florian Westphal <fw@strlen.de> > > Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> > > > > Ping... > > What is the status of this patch? applied, thanks. Please, elaborate the description better next time btw. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-02-29 3:08 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-03 5:40 [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Cong Wang 2012-02-03 5:40 ` [PATCH 2/2] netfilter: remove rev 0 of xt_connlimit Cong Wang 2012-02-03 8:15 ` [PATCH 1/2] netfilter: remove include/linux/netfilter_ipv4/ipt_addrtype.h Florian Westphal 2012-02-03 10:02 ` [Patch] netfilter: remove ipt_SAME.h and ipt_realm.h too Cong Wang 2012-02-27 6:17 ` Cong Wang 2012-02-27 17:40 ` Jan Ceuleers 2012-02-29 3:08 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).