netlink: No need to reference array when passing as pointer

Struct nft_data_linearize::value is an array, drop the reference
operator.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/src/netlink.c b/src/netlink.c
index 5511d9888e5bd578bf0086eff15a532a30b0c71b..7882381ebd389eda47019006612254c13b5e5964 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -139,17 +139,17 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,
                        netlink_gen_key(key, &nld);
                        key->flags &= ~EXPR_F_INTERVAL;
 
-                       nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, &nld.value, nld.len);
+                       nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, nld.value, nld.len);
 
                        key->flags |= EXPR_F_INTERVAL_END;
                        netlink_gen_key(key, &nld);
                        key->flags &= ~EXPR_F_INTERVAL_END;
 
                        nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY_END,
-                                          &nld.value, nld.len);
+                                          nld.value, nld.len);
                } else {
                        netlink_gen_key(key, &nld);
-                       nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, &nld.value, nld.len);
+                       nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, nld.value, nld.len);
                }
                break;
        }

diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index d01cadf84faf0a2993f7b11899d73b5bde49356f..43cfbfa75f3d2fd4c7bf852ede1db52a3b2420f9 100644 (file)
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -482,8 +482,8 @@ static struct expr *netlink_gen_prefix(struct netlink_linearize_ctx *ctx,
        netlink_put_register(nle, NFTNL_EXPR_BITWISE_SREG, sreg);
        netlink_put_register(nle, NFTNL_EXPR_BITWISE_DREG, sreg);
        nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_LEN, nld.len);
-       nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, &nld.value, nld.len);
-       nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, &zero.value, zero.len);
+       nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, nld.value, nld.len);
+       nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, zero.value, zero.len);
        nft_rule_add_expr(ctx, nle, &expr->location);
 
        return expr->right->prefix;
@@ -558,8 +558,8 @@ static void netlink_gen_flagcmp(struct netlink_linearize_ctx *ctx,
                netlink_put_register(nle, NFTNL_EXPR_BITWISE_SREG, sreg);
                netlink_put_register(nle, NFTNL_EXPR_BITWISE_DREG, sreg);
                nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_LEN, len);
-               nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, &nld2.value, nld2.len);
-               nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, &nld.value, nld.len);
+               nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, nld2.value, nld2.len);
+               nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, nld.value, nld.len);
                nft_rule_add_expr(ctx, nle, &expr->location);
 
                nle = alloc_nft_expr("cmp");