Commit 68c07cb6 authored by Cong Wang's avatar Cong Wang Committed by Pablo Neira Ayuso
Browse files

netfilter: xt_connlimit: remove revision 0 



It was scheduled to be removed.

Cc: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 7a74c1a1

Documentation/feature-removal-schedule.txt

+0 −7
Original line number Diff line number Diff line
@@ -414,13 +414,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

include/linux/netfilter/xt_connlimit.h

+2 −7
Original line number Diff line number Diff line
@@ -22,13 +22,8 @@ struct xt_connlimit_info { 
#endif

	};

	unsigned int limit;

	union {

		/* revision 0 */

		unsigned int inverse;



	/* revision 1 */

	__u32 flags;

	};



	/* Used internally by the kernel */

	struct xt_connlimit_data *data __attribute__((aligned(8)));

net/netfilter/xt_connlimit.c

+11 −24
Original line number Diff line number Diff line
@@ -274,18 +274,7 @@ 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,

	},

	{

static struct xt_match connlimit_mt_reg __read_mostly = {

	.name       = "connlimit",

	.revision   = 1,

	.family     = NFPROTO_UNSPEC,
@@ -294,18 +283,16 @@ static struct xt_match connlimit_mt_reg[] __read_mostly = { 
	.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);