From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 24 Oct 2018 16:47:15 +0000 (+0200)
Subject: netlink: remove netlink_batch_send()
X-Git-Tag: v0.9.1~206
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4e9c475680aff492c34845a958638c1a43906e07;p=thirdparty%2Fnftables.git

netlink: remove netlink_batch_send()

Replace it by direct call to mnl_batch_talk().

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/include/netlink.h b/include/netlink.h
index 8bdf192b..5ff129ed 100644
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -148,8 +148,6 @@ extern void netlink_dump_set(const struct nftnl_set *nls,
 extern void netlink_dump_obj(struct nftnl_obj *nlo, struct netlink_ctx *ctx);
 extern void netlink_dump_flowtable(struct nftnl_flowtable *flo, struct netlink_ctx *ctx);
 
-extern int netlink_batch_send(struct netlink_ctx *ctx, struct list_head *err_list);
-
 #define netlink_abi_error()	\
 	__netlink_abi_error(__FILE__, __LINE__, strerror(errno));
 extern void __noreturn __netlink_abi_error(const char *file, int line, const char *reason);
diff --git a/src/libnftables.c b/src/libnftables.c
index 0731c532..e892083f 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -56,7 +56,7 @@ static int nft_netlink(struct nft_ctx *nft,
 	if (!mnl_batch_ready(batch))
 		goto out;
 
-	ret = netlink_batch_send(&ctx, &err_list);
+	ret = mnl_batch_talk(&ctx, &err_list);
 
 	list_for_each_entry_safe(err, tmp, &err_list, head) {
 		list_for_each_entry(cmd, cmds, list) {
diff --git a/src/netlink.c b/src/netlink.c
index ede08ffd..fc9aeeff 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -1117,11 +1117,6 @@ int netlink_list_flowtables(struct netlink_ctx *ctx, const struct handle *h)
 	return err;
 }
 
-int netlink_batch_send(struct netlink_ctx *ctx, struct list_head *err_list)
-{
-	return mnl_batch_talk(ctx, err_list);
-}
-
 struct nftnl_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx,
 					 const struct handle *h,
 					 const struct location *loc)