flowtable: remove NFTA_FLOWTABLE_SIZE

Never defined in upstream Linux kernel uAPI, remove it.

Reported-by: Eric Garver <eric@garver.life>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Eric Garver <eric@garver.life>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 81c27d3c9ffd9f1ea121c3e845199ba18ffe8919..bb9b049310dffbebbaf84113aaee5737bbf94190 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -1518,7 +1518,6 @@ enum nft_object_attributes {
  * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
  * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
  * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
- * @NFTA_FLOWTABLE_SIZE: maximum size (NLA_U32)
  * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)
  */
 enum nft_flowtable_attributes {
@@ -1529,7 +1528,6 @@ enum nft_flowtable_attributes {
        NFTA_FLOWTABLE_USE,
        NFTA_FLOWTABLE_HANDLE,
        NFTA_FLOWTABLE_PAD,
-       NFTA_FLOWTABLE_SIZE,
        NFTA_FLOWTABLE_FLAGS,
        __NFTA_FLOWTABLE_MAX
 };

diff --git a/src/flowtable.c b/src/flowtable.c
index ec89b952e47dad0344bda89664cd78a9677e3b70..324e80f7e6ad63da601359e4ee51c985aecdc083 100644 (file)
--- a/src/flowtable.c
+++ b/src/flowtable.c
@@ -324,8 +324,6 @@ void nftnl_flowtable_nlmsg_build_payload(struct nlmsghdr *nlh,
                mnl_attr_put_u32(nlh, NFTA_FLOWTABLE_FLAGS, htonl(c->ft_flags));
        if (c->flags & (1 << NFTNL_FLOWTABLE_USE))
                mnl_attr_put_u32(nlh, NFTA_FLOWTABLE_USE, htonl(c->use));
-       if (c->flags & (1 << NFTNL_FLOWTABLE_SIZE))
-               mnl_attr_put_u32(nlh, NFTA_FLOWTABLE_SIZE, htonl(c->size));
        if (c->flags & (1 << NFTNL_FLOWTABLE_HANDLE))
                mnl_attr_put_u64(nlh, NFTA_FLOWTABLE_HANDLE, htobe64(c->handle));
 }
@@ -489,10 +487,6 @@ int nftnl_flowtable_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_flowtab
                c->use = ntohl(mnl_attr_get_u32(tb[NFTA_FLOWTABLE_USE]));
                c->flags |= (1 << NFTNL_FLOWTABLE_USE);
        }
-       if (tb[NFTA_FLOWTABLE_SIZE]) {
-               c->size = ntohl(mnl_attr_get_u32(tb[NFTA_FLOWTABLE_SIZE]));
-               c->flags |= (1 << NFTNL_FLOWTABLE_SIZE);
-       }
        if (tb[NFTA_FLOWTABLE_HANDLE]) {
                c->handle = be64toh(mnl_attr_get_u64(tb[NFTA_FLOWTABLE_HANDLE]));
                c->flags |= (1 << NFTNL_FLOWTABLE_HANDLE);