netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: phil@nwl.cc
Subject: [PATCH nft,v2 3/7] mnl: call mnl_set_sndbuffer() from mnl_batch_talk()
Date: Thu, 30 May 2019 12:55:25 +0200	[thread overview]
Message-ID: <20190530105529.12657-3-pablo@netfilter.org> (raw)
In-Reply-To: <20190530105529.12657-1-pablo@netfilter.org>

Instead of mnl_nft_socket_sendmsg(), just a cleanup.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/mnl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mnl.c b/src/mnl.c
index a84a6a609333..b3999d5f1d9f 100644
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -272,7 +272,6 @@ static ssize_t mnl_nft_socket_sendmsg(const struct netlink_ctx *ctx)
 	};
 	uint32_t i;
 
-	mnl_set_sndbuffer(ctx->nft->nf_sock, ctx->batch);
 	nftnl_batch_iovec(ctx->batch, iov, iov_len);
 
 	for (i = 0; i < iov_len; i++) {
@@ -298,6 +297,8 @@ int mnl_batch_talk(struct netlink_ctx *ctx, struct list_head *err_list)
 	};
 	int err = 0;
 
+	mnl_set_sndbuffer(ctx->nft->nf_sock, ctx->batch);
+
 	ret = mnl_nft_socket_sendmsg(ctx);
 	if (ret == -1)
 		return -1;
-- 
2.11.0


  parent reply	other threads:[~2019-05-30 10:55 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-30 10:55 [PATCH nft,v2 1/7] mnl: add mnl_set_rcvbuffer() and use it Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 2/7] mnl: mnl_set_rcvbuffer() skips buffer size update if it is too small Pablo Neira Ayuso
2019-05-30 10:55 ` Pablo Neira Ayuso [this message]
2019-05-30 10:55 ` [PATCH nft,v2 4/7] mnl: add mnl_nft_batch_to_msg() Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 5/7] mnl: estimate receiver buffer size Pablo Neira Ayuso
2019-05-31 18:11   ` Eric Garver
2019-05-31 18:40     ` Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 6/7] mnl: mnl_batch_talk() returns -1 on internal netlink errors Pablo Neira Ayuso
2019-05-30 10:55 ` [PATCH nft,v2 7/7] erec: remove double \n on error when internal_netlink is used Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190530105529.12657-3-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=phil@nwl.cc \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).