examples: remove nftnl_batch_is_supported() call

Linux kernel <= 3.13 needs for this check, remove it from examples.

Kernel commit:

  958bee14d071 ("netfilter: nf_tables: use new transaction infrastructure to handle sets")

added support for set into the batch.

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

diff --git a/examples/nft-flowtable-add.c b/examples/nft-flowtable-add.c
index 5ca62be01a0166b47910d18386b312edaec4a7d4..4e0e50b95cbffce2e9d973ffcd889e3149687d0d 100644 (file)
--- a/examples/nft-flowtable-add.c
+++ b/examples/nft-flowtable-add.c
@@ -47,7 +47,6 @@ int main(int argc, char *argv[])
        int ret, family;
        struct nftnl_flowtable *t;
        struct mnl_nlmsg_batch *batch;
-       int batching;
 
        if (argc != 6) {
                fprintf(stderr, "Usage: %s <family> <table> <name> <hook> <prio>\n",
@@ -74,19 +73,11 @@ int main(int argc, char *argv[])
        if (t == NULL)
                exit(EXIT_FAILURE);
 
-       batching = nftnl_batch_is_supported();
-       if (batching < 0) {
-               perror("cannot talk to nfnetlink");
-               exit(EXIT_FAILURE);
-       }
-
        seq = time(NULL);
        batch = mnl_nlmsg_batch_start(buf, sizeof(buf));
 
-       if (batching) {
-               nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++);
-               mnl_nlmsg_batch_next(batch);
-       }
+       nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++);
+       mnl_nlmsg_batch_next(batch);
 
        flowtable_seq = seq;
        nlh = nftnl_flowtable_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch),
@@ -96,10 +87,8 @@ int main(int argc, char *argv[])
        nftnl_flowtable_free(t);
        mnl_nlmsg_batch_next(batch);
 
-       if (batching) {
-               nftnl_batch_end(mnl_nlmsg_batch_current(batch), seq++);
-               mnl_nlmsg_batch_next(batch);
-       }
+       nftnl_batch_end(mnl_nlmsg_batch_current(batch), seq++);
+       mnl_nlmsg_batch_next(batch);
 
        nl = mnl_socket_open(NETLINK_NETFILTER);
        if (nl == NULL) {

diff --git a/examples/nft-flowtable-del.c b/examples/nft-flowtable-del.c
index 91e5d3a744106625c311f99e075c3d05569e338b..ffc83b25f716667b46580daf9101add904224ec0 100644 (file)
--- a/examples/nft-flowtable-del.c
+++ b/examples/nft-flowtable-del.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
        struct nlmsghdr *nlh;
        uint32_t portid, seq, flowtable_seq;
        struct nftnl_flowtable *t;
-       int ret, family, batching;
+       int ret, family;
 
        if (argc != 4) {
                fprintf(stderr, "Usage: %s <family> <table> <flowtable>\n",
@@ -60,19 +60,11 @@ int main(int argc, char *argv[])
        if (t == NULL)
                exit(EXIT_FAILURE);
 
-       batching = nftnl_batch_is_supported();
-       if (batching < 0) {
-               perror("cannot talk to nfnetlink");
-               exit(EXIT_FAILURE);
-       }
-
        seq = time(NULL);
        batch = mnl_nlmsg_batch_start(buf, sizeof(buf));
 
-       if (batching) {
-               nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++);
-               mnl_nlmsg_batch_next(batch);
-       }
+       nftnl_batch_begin(mnl_nlmsg_batch_current(batch), seq++);
+       mnl_nlmsg_batch_next(batch);
 
        flowtable_seq = seq;
        nlh = nftnl_flowtable_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch),
@@ -82,10 +74,8 @@ int main(int argc, char *argv[])
        nftnl_flowtable_free(t);
        mnl_nlmsg_batch_next(batch);
 
-       if (batching) {
-               nftnl_batch_end(mnl_nlmsg_batch_current(batch), seq++);
-               mnl_nlmsg_batch_next(batch);
-       }
+       nftnl_batch_end(mnl_nlmsg_batch_current(batch), seq++);
+       mnl_nlmsg_batch_next(batch);
 
        nl = mnl_socket_open(NETLINK_NETFILTER);
        if (nl == NULL) {