diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/netlink.h | 2 | ||||
| -rw-r--r-- | include/nftables.h | 1 | ||||
| -rw-r--r-- | include/rule.h | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/netlink.h b/include/netlink.h index 0d71a6b9..66686e5a 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -42,7 +42,6 @@ extern const struct location netlink_location; * @octx: output context * @debug_mask: display debugging information * @cache: cache context - * @range_merge: merge adjacent/overlapping ranges in new set elements */ struct netlink_ctx { struct mnl_socket *nf_sock; @@ -56,7 +55,6 @@ struct netlink_ctx { unsigned int debug_mask; struct output_ctx *octx; struct nft_cache *cache; - bool range_merge; }; extern struct nftnl_table *alloc_nftnl_table(const struct handle *h); diff --git a/include/nftables.h b/include/nftables.h index f22df0d1..3bfa33e5 100644 --- a/include/nftables.h +++ b/include/nftables.h @@ -31,7 +31,6 @@ struct nft_ctx { unsigned int debug_mask; struct output_ctx output; bool check; - bool range_merge; struct nft_cache cache; uint32_t flags; }; diff --git a/include/rule.h b/include/rule.h index 4e5a349a..d9c172dd 100644 --- a/include/rule.h +++ b/include/rule.h @@ -220,6 +220,7 @@ extern struct rule *rule_lookup(const struct chain *chain, uint64_t handle); * @init: initializer * @rg_cache: cached range element (left) * @policy: set mechanism policy + * @automerge: merge adjacents and overlapping elements, if possible * @desc: set mechanism desc */ struct set { @@ -237,6 +238,7 @@ struct set { struct expr *init; struct expr *rg_cache; uint32_t policy; + bool automerge; struct { uint32_t size; } desc; @@ -528,6 +530,7 @@ enum udata_type { enum udata_set_type { UDATA_SET_KEYBYTEORDER, UDATA_SET_DATABYTEORDER, + UDATA_SET_MERGE_ELEMENTS, __UDATA_SET_MAX, }; #define UDATA_SET_MAX (__UDATA_SET_MAX - 1) |