|
 |
f3c8d0 |
From 77a93baa622f8aa33fa6182d72b380d980e39574 Mon Sep 17 00:00:00 2001
|
|
|
f3c8d0 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
f3c8d0 |
Date: Sat, 8 Aug 2020 00:09:06 +0200
|
|
|
f3c8d0 |
Subject: [PATCH] include: Resync nf_tables.h cache copy
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1820684
|
|
|
f3c8d0 |
Upstream Status: nftables commit f1e5a0499c077
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
commit f1e5a0499c0773f18bc592dd0da0340120daa482
|
|
|
f3c8d0 |
Author: Stefano Brivio <sbrivio@redhat.com>
|
|
|
f3c8d0 |
Date: Mon Apr 13 21:48:02 2020 +0200
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
include: Resync nf_tables.h cache copy
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
Get this header in sync with nf.git as of commit ef516e8625dd.
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
|
|
|
f3c8d0 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
f3c8d0 |
---
|
|
|
f3c8d0 |
include/linux/netfilter/nf_tables.h | 2 ++
|
|
|
f3c8d0 |
1 file changed, 2 insertions(+)
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
|
|
|
f3c8d0 |
index 1a99df3..9b54a86 100644
|
|
|
f3c8d0 |
--- a/include/linux/netfilter/nf_tables.h
|
|
|
f3c8d0 |
+++ b/include/linux/netfilter/nf_tables.h
|
|
|
f3c8d0 |
@@ -274,6 +274,7 @@ enum nft_rule_compat_attributes {
|
|
|
f3c8d0 |
* @NFT_SET_TIMEOUT: set uses timeouts
|
|
|
f3c8d0 |
* @NFT_SET_EVAL: set can be updated from the evaluation path
|
|
|
f3c8d0 |
* @NFT_SET_OBJECT: set contains stateful objects
|
|
|
f3c8d0 |
+ * @NFT_SET_CONCAT: set contains a concatenation
|
|
|
f3c8d0 |
*/
|
|
|
f3c8d0 |
enum nft_set_flags {
|
|
|
f3c8d0 |
NFT_SET_ANONYMOUS = 0x1,
|
|
|
f3c8d0 |
@@ -283,6 +284,7 @@ enum nft_set_flags {
|
|
|
f3c8d0 |
NFT_SET_TIMEOUT = 0x10,
|
|
|
f3c8d0 |
NFT_SET_EVAL = 0x20,
|
|
|
f3c8d0 |
NFT_SET_OBJECT = 0x40,
|
|
|
f3c8d0 |
+ NFT_SET_CONCAT = 0x80,
|
|
|
f3c8d0 |
};
|
|
|
f3c8d0 |
|
|
|
f3c8d0 |
/**
|
|
|
f3c8d0 |
--
|
|
|
f3c8d0 |
1.8.3.1
|
|
|
f3c8d0 |
|