summaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-01-03 12:16:17 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-07 23:57:30 +0100
commit124edfa9e0451e97d621cd2796a44ff499e21036 (patch)
treed7c59ffc63c97113be80fcefeb14f85b62f22ee0 /net/netfilter
parent1d49144c0aaa61be4e3ccbef9cc5c40b0ec5f2fe (diff)
downloadlinux-stable-124edfa9e0451e97d621cd2796a44ff499e21036.tar.gz
linux-stable-124edfa9e0451e97d621cd2796a44ff499e21036.tar.bz2
linux-stable-124edfa9e0451e97d621cd2796a44ff499e21036.zip
netfilter: nf_tables: add nfproto support to meta expression
Needed by multi-family tables to distinguish IPv4 and IPv6 packets. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nft_meta.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 1ceaaa6dfe72..999d04688433 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -43,6 +43,9 @@ static void nft_meta_get_eval(const struct nft_expr *expr,
case NFT_META_PROTOCOL:
*(__be16 *)dest->data = skb->protocol;
break;
+ case NFT_META_NFPROTO:
+ dest->data[0] = pkt->ops->pf;
+ break;
case NFT_META_PRIORITY:
dest->data[0] = skb->priority;
break;
@@ -181,6 +184,7 @@ static int nft_meta_init_validate_get(uint32_t key)
switch (key) {
case NFT_META_LEN:
case NFT_META_PROTOCOL:
+ case NFT_META_NFPROTO:
case NFT_META_PRIORITY:
case NFT_META_MARK:
case NFT_META_IIF: