From c09cb090bbf4eab167441a30ca6aabf7ef5b527b Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 11 Sep 2014 14:10:48 +0200 Subject: include: refresh include/linux/nf_tables.h cached copy Keep in sync with nf_tables.h header file in net-next tree. Rename NFT_CT_LABEL to NFT_CT_LABELS, this probably slipped through when editing the header file by hand. Signed-off-by: Pablo Neira Ayuso --- src/ct.c | 2 +- src/parser.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ct.c b/src/ct.c index 30639b24..2eb85eaf 100644 --- a/src/ct.c +++ b/src/ct.c @@ -195,7 +195,7 @@ static const struct ct_template ct_templates[] = { [NFT_CT_PROTO_DST] = CT_TEMPLATE("proto-dst", &invalid_type, BYTEORDER_BIG_ENDIAN, 2 * BITS_PER_BYTE), - [NFT_CT_LABEL] = CT_TEMPLATE("label", &ct_label_type, + [NFT_CT_LABELS] = CT_TEMPLATE("label", &ct_label_type, BYTEORDER_HOST_ENDIAN, CT_LABEL_BIT_SIZE), }; diff --git a/src/parser.y b/src/parser.y index aa40f905..6737aad2 100644 --- a/src/parser.y +++ b/src/parser.y @@ -1896,7 +1896,7 @@ ct_key : STATE { $$ = NFT_CT_STATE; } | PROTOCOL { $$ = NFT_CT_PROTOCOL; } | PROTO_SRC { $$ = NFT_CT_PROTO_SRC; } | PROTO_DST { $$ = NFT_CT_PROTO_DST; } - | LABEL { $$ = NFT_CT_LABEL; } + | LABEL { $$ = NFT_CT_LABELS; } ; ct_stmt : CT ct_key SET expr -- cgit v1.2.3