Merge remote-tracking branch 'origin/master' into next-3.14

Signed-off-by: Patrick McHardy <kaber@trash.net>

Conflicts:
	include/nftables.h
	src/main.c

1 files changed, 6 insertions, 0 deletions

diff --git a/src/evaluate.c b/src/evaluate.c
index 4ca32943..2b2427a5 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1222,6 +1222,12 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
 		return set_error(ctx, set, "unqualified key data type "
 				 "specified in %s definition", type);
 
+	if (set->init != NULL) {
+		expr_set_context(&ctx->ectx, set->keytype, set->keylen);
+		if (expr_evaluate(ctx, &set->init) < 0)
+			return -1;
+	}
+
 	if (!(set->flags & SET_F_MAP))
 		return 0;