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 8bdf192b5e680929ba3d602110657c744a963226..5ff129ed922981b7a76206855a091d6f99a78331 100644 (file)
--- 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 0731c532a22a75257b863457c0005d115f92b80d..e892083f8818ca28da5638102cb9eae271f39a2b 100644 (file)
--- 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 ede08ffd76b7375605531c9e9370a4afee0f5460..fc9aeeff05b37cc71c9430dfb29c46b80de9dbc1 100644 (file)
--- 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)