openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: xt_connlimit: remove revision 0 

It was scheduled to be removed.

Cc: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Cong Wang 2012-05-19 04:39:01 +00:00 committed by Pablo Neira Ayuso
parent 7a74c1a18d
commit 68c07cb6d8
3 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/feature-removal-schedule.txt
View File

@ -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 What: i2c_driver.attach_adapter
i2c_driver.detach_adapter i2c_driver.detach_adapter
When: September 2011 When: September 2011

9
include/linux/netfilter/xt_connlimit.h
View File

@ -22,13 +22,8 @@ struct xt_connlimit_info {
#endif #endif
}; };
unsigned int limit; unsigned int limit;
union { /* revision 1 */
/* revision 0 */ __u32 flags;
unsigned int inverse;
/* revision 1 */
__u32 flags;
};
/* Used internally by the kernel */ /* Used internally by the kernel */
struct xt_connlimit_data *data __attribute__((aligned(8))); struct xt_connlimit_data *data __attribute__((aligned(8)));

35
net/netfilter/xt_connlimit.c
View File

@ -274,38 +274,25 @@ static void connlimit_mt_destroy(const struct xt_mtdtor_param *par)
kfree(info->data); kfree(info->data);
} }
static struct xt_match connlimit_mt_reg[] __read_mostly = { static struct xt_match connlimit_mt_reg __read_mostly = {
{ .name = "connlimit",
.name = "connlimit", .revision = 1,
.revision = 0, .family = NFPROTO_UNSPEC,
.family = NFPROTO_UNSPEC, .checkentry = connlimit_mt_check,
.checkentry = connlimit_mt_check, .match = connlimit_mt,
.match = connlimit_mt, .matchsize = sizeof(struct xt_connlimit_info),
.matchsize = sizeof(struct xt_connlimit_info), .destroy = connlimit_mt_destroy,
.destroy = connlimit_mt_destroy, .me = THIS_MODULE,
.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 int __init connlimit_mt_init(void) static int __init connlimit_mt_init(void)
{ {
return xt_register_matches(connlimit_mt_reg, return xt_register_match(&connlimit_mt_reg);
ARRAY_SIZE(connlimit_mt_reg));
} }
static void __exit connlimit_mt_exit(void) 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); module_init(connlimit_mt_init);