Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2a04aabf5c96c9e25df488949b21223bcc623815

Authored by Julia Lawall
Committed by Pablo Neira Ayuso
1 parent 5b9ccdcb98

netfilter: constify nf_conntrack_l3/4proto parameters 

When a nf_conntrack_l3/4proto parameter is not on the left hand side
of an assignment, its address is not taken, and it is not passed to a
function that may modify its fields, then it can be declared as const.

This change is useful from a documentation point of view, and can
possibly facilitate making some nf_conntrack_l3/4proto structures const
subsequently.

Done with the help of Coccinelle.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Showing 6 changed files with 30 additions and 29 deletions Side-by-side Diff

include/net/netfilter/nf_conntrack_l4proto.h
Diff comments   View file @ 2a04aab
... ... @@ -125,23 +125,23 @@
125 125  
126 126 struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u_int16_t l3proto,
127 127 u_int8_t l4proto);
128   -void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
  128 +void nf_ct_l4proto_put(const struct nf_conntrack_l4proto *p);
129 129  
130 130 /* Protocol pernet registration. */
131 131 int nf_ct_l4proto_pernet_register_one(struct net *net,
132   - struct nf_conntrack_l4proto *proto);
  132 + const struct nf_conntrack_l4proto *proto);
133 133 void nf_ct_l4proto_pernet_unregister_one(struct net *net,
134   - struct nf_conntrack_l4proto *proto);
  134 + const struct nf_conntrack_l4proto *proto);
135 135 int nf_ct_l4proto_pernet_register(struct net *net,
136   - struct nf_conntrack_l4proto *proto[],
  136 + struct nf_conntrack_l4proto *const proto[],
137 137 unsigned int num_proto);
138 138 void nf_ct_l4proto_pernet_unregister(struct net *net,
139   - struct nf_conntrack_l4proto *proto[],
140   - unsigned int num_proto);
  139 + struct nf_conntrack_l4proto *const proto[],
  140 + unsigned int num_proto);
141 141  
142 142 /* Protocol global registration. */
143 143 int nf_ct_l4proto_register_one(struct nf_conntrack_l4proto *proto);
144   -void nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *proto);
  144 +void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *proto);
145 145 int nf_ct_l4proto_register(struct nf_conntrack_l4proto *proto[],
146 146 unsigned int num_proto);
147 147 void nf_ct_l4proto_unregister(struct nf_conntrack_l4proto *proto[],
include/net/netfilter/nf_conntrack_timeout.h
Diff comments   View file @ 2a04aab
... ... @@ -68,7 +68,7 @@
68 68  
69 69 static inline unsigned int *
70 70 nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct,
71   - struct nf_conntrack_l4proto *l4proto)
  71 + const struct nf_conntrack_l4proto *l4proto)
72 72 {
73 73 #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
74 74 struct nf_conn_timeout *timeout_ext;
net/netfilter/nf_conntrack_core.c
Diff comments   View file @ 2a04aab
... ... @@ -1176,8 +1176,8 @@
1176 1176 static noinline struct nf_conntrack_tuple_hash *
1177 1177 init_conntrack(struct net *net, struct nf_conn *tmpl,
1178 1178 const struct nf_conntrack_tuple *tuple,
1179   - struct nf_conntrack_l3proto *l3proto,
1180   - struct nf_conntrack_l4proto *l4proto,
  1179 + const struct nf_conntrack_l3proto *l3proto,
  1180 + const struct nf_conntrack_l4proto *l4proto,
1181 1181 struct sk_buff *skb,
1182 1182 unsigned int dataoff, u32 hash)
1183 1183 {
... ... @@ -1288,8 +1288,8 @@
1288 1288 unsigned int dataoff,
1289 1289 u_int16_t l3num,
1290 1290 u_int8_t protonum,
1291   - struct nf_conntrack_l3proto *l3proto,
1292   - struct nf_conntrack_l4proto *l4proto)
  1291 + const struct nf_conntrack_l3proto *l3proto,
  1292 + const struct nf_conntrack_l4proto *l4proto)
1293 1293 {
1294 1294 const struct nf_conntrack_zone *zone;
1295 1295 struct nf_conntrack_tuple tuple;
net/netfilter/nf_conntrack_netlink.c
Diff comments   View file @ 2a04aab
... ... @@ -61,8 +61,8 @@
61 61 static char __initdata version[] = "0.93";
62 62  
63 63 static int ctnetlink_dump_tuples_proto(struct sk_buff *skb,
64   - const struct nf_conntrack_tuple *tuple,
65   - struct nf_conntrack_l4proto *l4proto)
  64 + const struct nf_conntrack_tuple *tuple,
  65 + const struct nf_conntrack_l4proto *l4proto)
66 66 {
67 67 int ret = 0;
68 68 struct nlattr *nest_parms;
... ... @@ -86,7 +86,7 @@
86 86  
87 87 static int ctnetlink_dump_tuples_ip(struct sk_buff *skb,
88 88 const struct nf_conntrack_tuple *tuple,
89   - struct nf_conntrack_l3proto *l3proto)
  89 + const struct nf_conntrack_l3proto *l3proto)
90 90 {
91 91 int ret = 0;
92 92 struct nlattr *nest_parms;
net/netfilter/nf_conntrack_proto.c
Diff comments   View file @ 2a04aab
... ... @@ -188,7 +188,7 @@
188 188 }
189 189 EXPORT_SYMBOL_GPL(nf_ct_l4proto_find_get);
190 190  
191   -void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p)
  191 +void nf_ct_l4proto_put(const struct nf_conntrack_l4proto *p)
192 192 {
193 193 module_put(p->me);
194 194 }
... ... @@ -257,7 +257,7 @@
257 257 EXPORT_SYMBOL_GPL(nf_ct_l3proto_unregister);
258 258  
259 259 static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,
260   - struct nf_conntrack_l4proto *l4proto)
  260 + const struct nf_conntrack_l4proto *l4proto)
261 261 {
262 262 if (l4proto->get_net_proto) {
263 263 /* statically built-in protocols use static per-net */
... ... @@ -272,7 +272,7 @@
272 272 static
273 273 int nf_ct_l4proto_register_sysctl(struct net *net,
274 274 struct nf_proto_net *pn,
275   - struct nf_conntrack_l4proto *l4proto)
  275 + const struct nf_conntrack_l4proto *l4proto)
276 276 {
277 277 int err = 0;
278 278  
... ... @@ -295,8 +295,8 @@
295 295  
296 296 static
297 297 void nf_ct_l4proto_unregister_sysctl(struct net *net,
298   - struct nf_proto_net *pn,
299   - struct nf_conntrack_l4proto *l4proto)
  298 + struct nf_proto_net *pn,
  299 + const struct nf_conntrack_l4proto *l4proto)
300 300 {
301 301 #ifdef CONFIG_SYSCTL
302 302 if (pn->ctl_table_header != NULL)
... ... @@ -366,7 +366,7 @@
366 366 EXPORT_SYMBOL_GPL(nf_ct_l4proto_register_one);
367 367  
368 368 int nf_ct_l4proto_pernet_register_one(struct net *net,
369   - struct nf_conntrack_l4proto *l4proto)
  369 + const struct nf_conntrack_l4proto *l4proto)
370 370 {
371 371 int ret = 0;
372 372 struct nf_proto_net *pn = NULL;
... ... @@ -391,7 +391,7 @@
391 391 }
392 392 EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_register_one);
393 393  
394   -static void __nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto)
  394 +static void __nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)
395 395  
396 396 {
397 397 BUG_ON(l4proto->l3proto >= ARRAY_SIZE(nf_ct_protos));
... ... @@ -404,7 +404,7 @@
404 404 &nf_conntrack_l4proto_generic);
405 405 }
406 406  
407   -void nf_ct_l4proto_unregister_one(struct nf_conntrack_l4proto *l4proto)
  407 +void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)
408 408 {
409 409 mutex_lock(&nf_ct_proto_mutex);
410 410 __nf_ct_l4proto_unregister_one(l4proto);
... ... @@ -415,7 +415,7 @@
415 415 EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister_one);
416 416  
417 417 void nf_ct_l4proto_pernet_unregister_one(struct net *net,
418   - struct nf_conntrack_l4proto *l4proto)
  418 + const struct nf_conntrack_l4proto *l4proto)
419 419 {
420 420 struct nf_proto_net *pn = nf_ct_l4proto_net(net, l4proto);
421 421  
... ... @@ -449,7 +449,7 @@
449 449 EXPORT_SYMBOL_GPL(nf_ct_l4proto_register);
450 450  
451 451 int nf_ct_l4proto_pernet_register(struct net *net,
452   - struct nf_conntrack_l4proto *l4proto[],
  452 + struct nf_conntrack_l4proto *const l4proto[],
453 453 unsigned int num_proto)
454 454 {
455 455 int ret = -EINVAL;
... ... @@ -485,8 +485,8 @@
485 485 EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister);
486 486  
487 487 void nf_ct_l4proto_pernet_unregister(struct net *net,
488   - struct nf_conntrack_l4proto *l4proto[],
489   - unsigned int num_proto)
  488 + struct nf_conntrack_l4proto *const l4proto[],
  489 + unsigned int num_proto)
490 490 {
491 491 while (num_proto-- != 0)
492 492 nf_ct_l4proto_pernet_unregister_one(net, l4proto[num_proto]);
net/netfilter/nfnetlink_cttimeout.c
Diff comments   View file @ 2a04aab
... ... @@ -47,7 +47,8 @@
47 47 };
48 48  
49 49 static int
50   -ctnl_timeout_parse_policy(void *timeouts, struct nf_conntrack_l4proto *l4proto,
  50 +ctnl_timeout_parse_policy(void *timeouts,
  51 + const struct nf_conntrack_l4proto *l4proto,
51 52 struct net *net, const struct nlattr *attr)
52 53 {
53 54 int ret = 0;
... ... @@ -401,7 +402,7 @@
401 402 static int
402 403 cttimeout_default_fill_info(struct net *net, struct sk_buff *skb, u32 portid,
403 404 u32 seq, u32 type, int event,
404   - struct nf_conntrack_l4proto *l4proto)
  405 + const struct nf_conntrack_l4proto *l4proto)
405 406 {
406 407 struct nlmsghdr *nlh;
407 408 struct nfgenmsg *nfmsg;