From da3f503dc3609a66d84782aa200c1aafaecdc1f7 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 27 Nov 2016 23:35:22 +0100 Subject: src: remove SET_F_* flag definitions They map exactly one to one to we have in the kernel headers, so use kernel definitions instead. Signed-off-by: Pablo Neira Ayuso --- src/segtree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/segtree.c') diff --git a/src/segtree.c b/src/segtree.c index 78657de1..8df82a80 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -403,7 +403,7 @@ static int set_to_segtree(struct list_head *msgs, struct set *set, * Insert elements into tree */ for (n = 0; n < init->size; n++) { - if (init->set_flags & SET_F_MAP && + if (init->set_flags & NFT_SET_MAP && n < init->size - 1 && interval_conflict(intervals[n], intervals[n+1])) return expr_binary_error(msgs, @@ -426,7 +426,7 @@ static bool segtree_needs_first_segment(const struct set *set, * 2) This set exists and it is empty. * 3) This set is created with a number of initial elements. */ - if ((set->flags & SET_F_ANONYMOUS) || + if ((set->flags & NFT_SET_ANONYMOUS) || (set->init && set->init->size == 0) || (set->init == init)) return true; -- cgit v1.2.3