From 119a49a5354c16208ec1bd24500a180bcbe86cd2 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 28 Jul 2017 13:55:45 +0200 Subject: mnl: Consolidate mnl_batch_talk() parameters The single caller of this function passes struct netlink_ctx fields as the first two parameters. This can be simplified by passing the context object itself and having mnl_batch_talk() access it's fields instead. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/mnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mnl.c') diff --git a/src/mnl.c b/src/mnl.c index 76393123..862311a7 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -246,9 +246,9 @@ static ssize_t mnl_nft_socket_sendmsg(const struct mnl_socket *nl, return sendmsg(mnl_socket_get_fd(nl), &msg, 0); } -int mnl_batch_talk(struct mnl_socket *nl, struct nftnl_batch *batch, - struct list_head *err_list) +int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list) { + struct mnl_socket *nl = ctx->nf_sock; int ret, fd = mnl_socket_get_fd(nl), portid = mnl_socket_get_portid(nl); char rcv_buf[MNL_SOCKET_BUFFER_SIZE]; fd_set readfds; @@ -257,7 +257,7 @@ int mnl_batch_talk(struct mnl_socket *nl, struct nftnl_batch *batch, .tv_usec = 0 }; - ret = mnl_nft_socket_sendmsg(nl, batch); + ret = mnl_nft_socket_sendmsg(nl, ctx->batch); if (ret == -1) return -1; -- cgit v1.2.3