Message ID | d978194ca83e9aa41a330a42442eecd8be9e9a60.1504093452.git.arvind.yadav.cs@gmail.com |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
Series | netfilter: nat: constify rhashtable_params | expand |
On Wed, Aug 30, 2017 at 05:18:04PM +0530, Arvind Yadav wrote: > rhashtable_params are not supposed to change at runtime. All > Functions rhashtable_* working with const rhashtable_params > provided by <linux/rhashtable.h>. So mark the non-const structs > as const. Applied to nf, thanks.
On Fri, Sep 08, 2017 at 01:46:30PM +0200, Pablo Neira Ayuso wrote: > On Wed, Aug 30, 2017 at 05:18:04PM +0530, Arvind Yadav wrote: > > rhashtable_params are not supposed to change at runtime. All > > Functions rhashtable_* working with const rhashtable_params > > provided by <linux/rhashtable.h>. So mark the non-const structs > > as const. > > Applied to nf, thanks. Actually, I tossed this. NAT rhashtable has been reverted, so no need for this constification anymore.
diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c index eb54178..d1f355e 100644 --- a/net/netfilter/nf_nat_core.c +++ b/net/netfilter/nf_nat_core.c @@ -198,7 +198,7 @@ static int nf_nat_bysource_cmp(struct rhashtable_compare_arg *arg, return 0; } -static struct rhashtable_params nf_nat_bysource_params = { +static const struct rhashtable_params nf_nat_bysource_params = { .head_offset = offsetof(struct nf_conn, nat_bysource), .obj_hashfn = nf_nat_bysource_hash, .obj_cmpfn = nf_nat_bysource_cmp,
rhashtable_params are not supposed to change at runtime. All Functions rhashtable_* working with const rhashtable_params provided by <linux/rhashtable.h>. So mark the non-const structs as const. Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> --- net/netfilter/nf_nat_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)