Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 68c07cb6d8aa05daf38ab47d5bb674d81a2066fb

Authored by Cong Wang
Committed by Pablo Neira Ayuso
1 parent 7a74c1a18d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 3 changed files with 13 additions and 38 deletions Side-by-side Diff

Documentation/feature-removal-schedule.txt
Diff comments   View file @ 68c07cb
... ... @@ -414,13 +414,6 @@
414 414  
415 415 ----------------------------
416 416  
417   -What: xt_connlimit rev 0
418   -When: 2012
419   -Who: Jan Engelhardt <jengelh@medozas.de>
420   -Files: net/netfilter/xt_connlimit.c
421   -
422   -----------------------------
423   -
424 417 What: i2c_driver.attach_adapter
425 418 i2c_driver.detach_adapter
426 419 When: September 2011
include/linux/netfilter/xt_connlimit.h
Diff comments   View file @ 68c07cb
... ... @@ -22,13 +22,8 @@
22 22 #endif
23 23 };
24 24 unsigned int limit;
25   - union {
26   - /* revision 0 */
27   - unsigned int inverse;
28   -
29   - /* revision 1 */
30   - __u32 flags;
31   - };
  25 + /* revision 1 */
  26 + __u32 flags;
32 27  
33 28 /* Used internally by the kernel */
34 29 struct xt_connlimit_data *data __attribute__((aligned(8)));
net/netfilter/xt_connlimit.c
Diff comments   View file @ 68c07cb
... ... @@ -274,38 +274,25 @@
274 274 kfree(info->data);
275 275 }
276 276  
277   -static struct xt_match connlimit_mt_reg[] __read_mostly = {
278   - {
279   - .name = "connlimit",
280   - .revision = 0,
281   - .family = NFPROTO_UNSPEC,
282   - .checkentry = connlimit_mt_check,
283   - .match = connlimit_mt,
284   - .matchsize = sizeof(struct xt_connlimit_info),
285   - .destroy = connlimit_mt_destroy,
286   - .me = THIS_MODULE,
287   - },
288   - {
289   - .name = "connlimit",
290   - .revision = 1,
291   - .family = NFPROTO_UNSPEC,
292   - .checkentry = connlimit_mt_check,
293   - .match = connlimit_mt,
294   - .matchsize = sizeof(struct xt_connlimit_info),
295   - .destroy = connlimit_mt_destroy,
296   - .me = THIS_MODULE,
297   - },
  277 +static struct xt_match connlimit_mt_reg __read_mostly = {
  278 + .name = "connlimit",
  279 + .revision = 1,
  280 + .family = NFPROTO_UNSPEC,
  281 + .checkentry = connlimit_mt_check,
  282 + .match = connlimit_mt,
  283 + .matchsize = sizeof(struct xt_connlimit_info),
  284 + .destroy = connlimit_mt_destroy,
  285 + .me = THIS_MODULE,
298 286 };
299 287  
300 288 static int __init connlimit_mt_init(void)
301 289 {
302   - return xt_register_matches(connlimit_mt_reg,
303   - ARRAY_SIZE(connlimit_mt_reg));
  290 + return xt_register_match(&connlimit_mt_reg);
304 291 }
305 292  
306 293 static void __exit connlimit_mt_exit(void)
307 294 {
308   - xt_unregister_matches(connlimit_mt_reg, ARRAY_SIZE(connlimit_mt_reg));
  295 + xt_unregister_match(&connlimit_mt_reg);
309 296 }
310 297  
311 298 module_init(connlimit_mt_init);