From cf85778a263a34aa2aeee565f3e046693164a097 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 13 Jan 2022 20:37:56 +0100 Subject: [PATCH] netlink: remove unused parameter from netlink_gen_stmt_stateful() Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2039594 Upstream Status: nftables commit 3f3e897f42965 commit 3f3e897f429659ff6c8387245d0d4115952a6c31 Author: Pablo Neira Ayuso Date: Wed Mar 11 13:02:26 2020 +0100 netlink: remove unused parameter from netlink_gen_stmt_stateful() Remove context from netlink_gen_stmt_stateful(). Signed-off-by: Pablo Neira Ayuso --- src/netlink_linearize.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index 28b0e6a..f5c6116 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -780,9 +780,7 @@ static void netlink_gen_objref_stmt(struct netlink_linearize_ctx *ctx, nftnl_rule_add_expr(ctx->nlr, nle); } -static struct nftnl_expr * -netlink_gen_connlimit_stmt(struct netlink_linearize_ctx *ctx, - const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_connlimit_stmt(const struct stmt *stmt) { struct nftnl_expr *nle; @@ -795,9 +793,7 @@ netlink_gen_connlimit_stmt(struct netlink_linearize_ctx *ctx, return nle; } -static struct nftnl_expr * -netlink_gen_counter_stmt(struct netlink_linearize_ctx *ctx, - const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_counter_stmt(const struct stmt *stmt) { struct nftnl_expr *nle; @@ -814,9 +810,7 @@ netlink_gen_counter_stmt(struct netlink_linearize_ctx *ctx, return nle; } -static struct nftnl_expr * -netlink_gen_limit_stmt(struct netlink_linearize_ctx *ctx, - const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_limit_stmt(const struct stmt *stmt) { struct nftnl_expr *nle; @@ -832,9 +826,7 @@ netlink_gen_limit_stmt(struct netlink_linearize_ctx *ctx, return nle; } -static struct nftnl_expr * -netlink_gen_quota_stmt(struct netlink_linearize_ctx *ctx, - const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_quota_stmt(const struct stmt *stmt) { struct nftnl_expr *nle; @@ -846,19 +838,17 @@ netlink_gen_quota_stmt(struct netlink_linearize_ctx *ctx, return nle; } -static struct nftnl_expr * -netlink_gen_stmt_stateful(struct netlink_linearize_ctx *ctx, - const struct stmt *stmt) +static struct nftnl_expr *netlink_gen_stmt_stateful(const struct stmt *stmt) { switch (stmt->ops->type) { case STMT_CONNLIMIT: - return netlink_gen_connlimit_stmt(ctx, stmt); + return netlink_gen_connlimit_stmt(stmt); case STMT_COUNTER: - return netlink_gen_counter_stmt(ctx, stmt); + return netlink_gen_counter_stmt(stmt); case STMT_LIMIT: - return netlink_gen_limit_stmt(ctx, stmt); + return netlink_gen_limit_stmt(stmt); case STMT_QUOTA: - return netlink_gen_quota_stmt(ctx, stmt); + return netlink_gen_quota_stmt(stmt); default: BUG("unknown stateful statement type %s\n", stmt->ops->name); } @@ -1307,7 +1297,7 @@ static void netlink_gen_set_stmt(struct netlink_linearize_ctx *ctx, if (stmt->set.stmt) nftnl_expr_set(nle, NFTNL_EXPR_DYNSET_EXPR, - netlink_gen_stmt_stateful(ctx, stmt->set.stmt), 0); + netlink_gen_stmt_stateful(stmt->set.stmt), 0); } static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx, @@ -1337,7 +1327,7 @@ static void netlink_gen_map_stmt(struct netlink_linearize_ctx *ctx, if (stmt->map.stmt) nftnl_expr_set(nle, NFTNL_EXPR_DYNSET_EXPR, - netlink_gen_stmt_stateful(ctx, stmt->map.stmt), 0); + netlink_gen_stmt_stateful(stmt->map.stmt), 0); nftnl_rule_add_expr(ctx->nlr, nle); } @@ -1369,7 +1359,7 @@ static void netlink_gen_meter_stmt(struct netlink_linearize_ctx *ctx, nftnl_expr_set_str(nle, NFTNL_EXPR_DYNSET_SET_NAME, set->handle.set.name); nftnl_expr_set_u32(nle, NFTNL_EXPR_DYNSET_SET_ID, set->handle.set_id); nftnl_expr_set(nle, NFTNL_EXPR_DYNSET_EXPR, - netlink_gen_stmt_stateful(ctx, stmt->meter.stmt), 0); + netlink_gen_stmt_stateful(stmt->meter.stmt), 0); nftnl_rule_add_expr(ctx->nlr, nle); } @@ -1415,7 +1405,7 @@ static void netlink_gen_stmt(struct netlink_linearize_ctx *ctx, case STMT_COUNTER: case STMT_LIMIT: case STMT_QUOTA: - nle = netlink_gen_stmt_stateful(ctx, stmt); + nle = netlink_gen_stmt_stateful(stmt); nftnl_rule_add_expr(ctx->nlr, nle); break; case STMT_NOTRACK: -- 2.31.1