summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-09-11 14:10:48 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-09-11 14:16:49 +0200
commitc09cb090bbf4eab167441a30ca6aabf7ef5b527b (patch)
tree3ef29a9d2c45a5aea4d6dde4e02707f99088dfc7 /src
parent6def2fbb5deb33b489dfef1ed8d23aac9f639c9f (diff)
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 <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/ct.c2
-rw-r--r--src/parser.y2
2 files changed, 2 insertions, 2 deletions
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