rename mnl_seqnum_alloc() to mnl_seqnum_inc(). No functional change is intended. Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> --- v2: no changes include/mnl.h | 2 +- src/libnftables.c | 6 +++--- src/mnl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/mnl.h b/include/mnl.h index c9502f328f1c..7c465d4426c4 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -8,7 +8,7 @@ struct mnl_socket *nft_mnl_socket_open(void); -uint32_t mnl_seqnum_alloc(uint32_t *seqnum); +uint32_t mnl_seqnum_inc(uint32_t *seqnum); uint32_t mnl_genid_get(struct netlink_ctx *ctx); struct mnl_err { diff --git a/src/libnftables.c b/src/libnftables.c index 2834c9922486..3550961d5d0e 100644 --- a/src/libnftables.c +++ b/src/libnftables.c @@ -37,9 +37,9 @@ static int nft_netlink(struct nft_ctx *nft, if (list_empty(cmds)) goto out; - batch_seqnum = mnl_batch_begin(ctx.batch, mnl_seqnum_alloc(&seqnum)); + batch_seqnum = mnl_batch_begin(ctx.batch, mnl_seqnum_inc(&seqnum)); list_for_each_entry(cmd, cmds, list) { - ctx.seqnum = cmd->seqnum = mnl_seqnum_alloc(&seqnum); + ctx.seqnum = cmd->seqnum = mnl_seqnum_inc(&seqnum); ret = do_command(&ctx, cmd); if (ret < 0) { netlink_io_error(&ctx, &cmd->location, @@ -50,7 +50,7 @@ static int nft_netlink(struct nft_ctx *nft, num_cmds++; } if (!nft->check) - mnl_batch_end(ctx.batch, mnl_seqnum_alloc(&seqnum)); + mnl_batch_end(ctx.batch, mnl_seqnum_inc(&seqnum)); if (!mnl_batch_ready(ctx.batch)) goto out; diff --git a/src/mnl.c b/src/mnl.c index db53a60b43cb..c1691da2e51b 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -70,7 +70,7 @@ struct mnl_socket *nft_mnl_socket_open(void) return nf_sock; } -uint32_t mnl_seqnum_alloc(unsigned int *seqnum) +uint32_t mnl_seqnum_inc(unsigned int *seqnum) { return (*seqnum)++; } -- 2.30.2