diff options
author | Jan Engelhardt <jengelh@computergmbh.de> | 2008-04-14 05:15:35 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-04-14 05:15:35 -0400 |
commit | 5452e425adfdfc4647b618e303f73d48f2405b0e (patch) | |
tree | 7cad164e9517cee49556c6c85e4f40d3c7f6b2b7 /net/netfilter | |
parent | 3cf93c96af7adf78542d45f8a27f0e5f8704409d (diff) |
[NETFILTER]: annotate {arp,ip,ip6,x}tables with const
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/x_tables.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 0bd95680a49..f52f7f810ac 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
@@ -58,7 +58,7 @@ static struct xt_af *xt; | |||
58 | #define duprintf(format, args...) | 58 | #define duprintf(format, args...) |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | static const char *xt_prefix[NPROTO] = { | 61 | static const char *const xt_prefix[NPROTO] = { |
62 | [AF_INET] = "ip", | 62 | [AF_INET] = "ip", |
63 | [AF_INET6] = "ip6", | 63 | [AF_INET6] = "ip6", |
64 | [NF_ARP] = "arp", | 64 | [NF_ARP] = "arp", |
@@ -248,7 +248,7 @@ EXPORT_SYMBOL_GPL(xt_request_find_target); | |||
248 | 248 | ||
249 | static int match_revfn(int af, const char *name, u8 revision, int *bestp) | 249 | static int match_revfn(int af, const char *name, u8 revision, int *bestp) |
250 | { | 250 | { |
251 | struct xt_match *m; | 251 | const struct xt_match *m; |
252 | int have_rev = 0; | 252 | int have_rev = 0; |
253 | 253 | ||
254 | list_for_each_entry(m, &xt[af].match, list) { | 254 | list_for_each_entry(m, &xt[af].match, list) { |
@@ -264,7 +264,7 @@ static int match_revfn(int af, const char *name, u8 revision, int *bestp) | |||
264 | 264 | ||
265 | static int target_revfn(int af, const char *name, u8 revision, int *bestp) | 265 | static int target_revfn(int af, const char *name, u8 revision, int *bestp) |
266 | { | 266 | { |
267 | struct xt_target *t; | 267 | const struct xt_target *t; |
268 | int have_rev = 0; | 268 | int have_rev = 0; |
269 | 269 | ||
270 | list_for_each_entry(t, &xt[af].target, list) { | 270 | list_for_each_entry(t, &xt[af].target, list) { |
@@ -385,7 +385,7 @@ short xt_compat_calc_jump(int af, unsigned int offset) | |||
385 | } | 385 | } |
386 | EXPORT_SYMBOL_GPL(xt_compat_calc_jump); | 386 | EXPORT_SYMBOL_GPL(xt_compat_calc_jump); |
387 | 387 | ||
388 | int xt_compat_match_offset(struct xt_match *match) | 388 | int xt_compat_match_offset(const struct xt_match *match) |
389 | { | 389 | { |
390 | u_int16_t csize = match->compatsize ? : match->matchsize; | 390 | u_int16_t csize = match->compatsize ? : match->matchsize; |
391 | return XT_ALIGN(match->matchsize) - COMPAT_XT_ALIGN(csize); | 391 | return XT_ALIGN(match->matchsize) - COMPAT_XT_ALIGN(csize); |
@@ -395,7 +395,7 @@ EXPORT_SYMBOL_GPL(xt_compat_match_offset); | |||
395 | int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, | 395 | int xt_compat_match_from_user(struct xt_entry_match *m, void **dstptr, |
396 | unsigned int *size) | 396 | unsigned int *size) |
397 | { | 397 | { |
398 | struct xt_match *match = m->u.kernel.match; | 398 | const struct xt_match *match = m->u.kernel.match; |
399 | struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m; | 399 | struct compat_xt_entry_match *cm = (struct compat_xt_entry_match *)m; |
400 | int pad, off = xt_compat_match_offset(match); | 400 | int pad, off = xt_compat_match_offset(match); |
401 | u_int16_t msize = cm->u.user.match_size; | 401 | u_int16_t msize = cm->u.user.match_size; |
@@ -422,7 +422,7 @@ EXPORT_SYMBOL_GPL(xt_compat_match_from_user); | |||
422 | int xt_compat_match_to_user(struct xt_entry_match *m, void __user **dstptr, | 422 | int xt_compat_match_to_user(struct xt_entry_match *m, void __user **dstptr, |
423 | unsigned int *size) | 423 | unsigned int *size) |
424 | { | 424 | { |
425 | struct xt_match *match = m->u.kernel.match; | 425 | const struct xt_match *match = m->u.kernel.match; |
426 | struct compat_xt_entry_match __user *cm = *dstptr; | 426 | struct compat_xt_entry_match __user *cm = *dstptr; |
427 | int off = xt_compat_match_offset(match); | 427 | int off = xt_compat_match_offset(match); |
428 | u_int16_t msize = m->u.user.match_size - off; | 428 | u_int16_t msize = m->u.user.match_size - off; |
@@ -479,7 +479,7 @@ int xt_check_target(const struct xt_target *target, unsigned short family, | |||
479 | EXPORT_SYMBOL_GPL(xt_check_target); | 479 | EXPORT_SYMBOL_GPL(xt_check_target); |
480 | 480 | ||
481 | #ifdef CONFIG_COMPAT | 481 | #ifdef CONFIG_COMPAT |
482 | int xt_compat_target_offset(struct xt_target *target) | 482 | int xt_compat_target_offset(const struct xt_target *target) |
483 | { | 483 | { |
484 | u_int16_t csize = target->compatsize ? : target->targetsize; | 484 | u_int16_t csize = target->compatsize ? : target->targetsize; |
485 | return XT_ALIGN(target->targetsize) - COMPAT_XT_ALIGN(csize); | 485 | return XT_ALIGN(target->targetsize) - COMPAT_XT_ALIGN(csize); |
@@ -489,7 +489,7 @@ EXPORT_SYMBOL_GPL(xt_compat_target_offset); | |||
489 | void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, | 489 | void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr, |
490 | unsigned int *size) | 490 | unsigned int *size) |
491 | { | 491 | { |
492 | struct xt_target *target = t->u.kernel.target; | 492 | const struct xt_target *target = t->u.kernel.target; |
493 | struct compat_xt_entry_target *ct = (struct compat_xt_entry_target *)t; | 493 | struct compat_xt_entry_target *ct = (struct compat_xt_entry_target *)t; |
494 | int pad, off = xt_compat_target_offset(target); | 494 | int pad, off = xt_compat_target_offset(target); |
495 | u_int16_t tsize = ct->u.user.target_size; | 495 | u_int16_t tsize = ct->u.user.target_size; |
@@ -515,7 +515,7 @@ EXPORT_SYMBOL_GPL(xt_compat_target_from_user); | |||
515 | int xt_compat_target_to_user(struct xt_entry_target *t, void __user **dstptr, | 515 | int xt_compat_target_to_user(struct xt_entry_target *t, void __user **dstptr, |
516 | unsigned int *size) | 516 | unsigned int *size) |
517 | { | 517 | { |
518 | struct xt_target *target = t->u.kernel.target; | 518 | const struct xt_target *target = t->u.kernel.target; |
519 | struct compat_xt_entry_target __user *ct = *dstptr; | 519 | struct compat_xt_entry_target __user *ct = *dstptr; |
520 | int off = xt_compat_target_offset(target); | 520 | int off = xt_compat_target_offset(target); |
521 | u_int16_t tsize = t->u.user.target_size - off; | 521 | u_int16_t tsize = t->u.user.target_size - off; |