flowtable: remove NFTA_FLOWTABLE_SIZE
Pablo Neira Ayuso
maintainerPATCH 1/1 flowtable: remove NFTA_FLOWTABLE_SIZE
Never defined in upstream Linux kernel uAPI, remove it.
Reported-by Eric Garver <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/linux/netfilter/nf_tables.h | 2 -- src/flowtable.c | 6 ------ 2 files changed, 8 deletions(-)
include/linux/netfilter/nf_tables.h +0 -2
@@ -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 };
src/flowtable.c +0 -6
@@ -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 );
Signature · 1 line
2.11.0
Quoted 55 lines · Pablo Neira Ayuso
Never defined in upstream Linux kernel uAPI, remove it.
Reported-by Eric Garver <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>--- include/linux/netfilter/nf_tables.h | 2 -- src/flowtable.c | 6 ------ 2 files changed, 8 deletions(-)include/linux/netfilter/nf_tables.h +0
-2@@ -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 };src/flowtable.c +0
-6@@ -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 );Signature · 1 line
2.11.0
Thanks Pablo.
Acked-by Eric Garver <[email protected]>
Pablo Neira Ayuso
maintainerQuoted 3 lines · Eric Garver
Thanks Pablo.
Acked-by Eric Garver <[email protected]>
Just pushed it out, thanks.