summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2014-02-18 15:25:32 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-02-19 11:41:25 +0100
commitd2bf2f34cc1a8304a5dab0d42e7a2ae58ede94cd (patch)
tree886fd9d2a812e9c6ecb5c90a08abf1a7fb1e6b56 /include/uapi
parent2ba436fc02f95446bfcb7138db44920ab63deb61 (diff)
downloadblackbird-op-linux-d2bf2f34cc1a8304a5dab0d42e7a2ae58ede94cd.tar.gz
blackbird-op-linux-d2bf2f34cc1a8304a5dab0d42e7a2ae58ede94cd.zip
netfilter: nft_ct: labels get support
This also adds NF_CT_LABELS_MAX_SIZE so it can be re-used as BUILD_BUG_ON in nft_ct. At this time, nft doesn't yet support writing to the label area; when this changes the label->words handling needs to be moved out of xt_connlabel.c into nf_conntrack_labels.c. Also removes a useless run-time check: words cannot grow beyond 4 (32 bit) or 2 (64bit) since xt_connlabel enforces a maximum of 128 labels. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/netfilter/nf_tables.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 83c985a6170b..c84c452c62a7 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -601,6 +601,7 @@ enum nft_ct_keys {
NFT_CT_PROTOCOL,
NFT_CT_PROTO_SRC,
NFT_CT_PROTO_DST,
+ NFT_CT_LABELS,
};
/**
OpenPOWER on IntegriCloud