From: Felix Fietkau <nbd@nbd.name>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org, nbd@nbd.name
Subject: [RFC 1/9] netfilter: nf_flow_table: use IP_CT_DIR_* values for FLOW_OFFLOAD_DIR_*
Date: Sat, 17 Feb 2018 12:11:58 +0100 [thread overview]
Message-ID: <20180217111206.37312-1-nbd@nbd.name> (raw)
Simplifies further code cleanups
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
include/net/netfilter/nf_flow_table.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index f44e93ff512a..9e7c222a38de 100644
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -6,6 +6,7 @@
#include <linux/netdevice.h>
#include <linux/rhashtable.h>
#include <linux/rcupdate.h>
+#include <linux/netfilter/nf_conntrack_tuple_common.h>
#include <net/dst.h>
struct nf_flowtable;
@@ -34,11 +35,10 @@ struct nf_flowtable {
};
enum flow_offload_tuple_dir {
- FLOW_OFFLOAD_DIR_ORIGINAL,
- FLOW_OFFLOAD_DIR_REPLY,
- __FLOW_OFFLOAD_DIR_MAX = FLOW_OFFLOAD_DIR_REPLY,
+ FLOW_OFFLOAD_DIR_ORIGINAL = IP_CT_DIR_ORIGINAL,
+ FLOW_OFFLOAD_DIR_REPLY = IP_CT_DIR_REPLY,
+ FLOW_OFFLOAD_DIR_MAX = IP_CT_DIR_MAX
};
-#define FLOW_OFFLOAD_DIR_MAX (__FLOW_OFFLOAD_DIR_MAX + 1)
struct flow_offload_tuple {
union {
--
2.14.2
next reply other threads:[~2018-02-17 11:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-17 11:11 Felix Fietkau [this message]
2018-02-17 11:11 ` [RFC 2/9] netfilter: nf_flow_table: clean up flow_offload_alloc Felix Fietkau
2018-02-17 11:12 ` [RFC 3/9] ipv6: make ip6_dst_mtu_forward inline Felix Fietkau
2018-02-17 11:12 ` [RFC 4/9] netfilter: nf_flow_table: cache mtu in struct flow_offload_tuple Felix Fietkau
2018-02-17 11:12 ` [RFC 5/9] netfilter: nf_flow_table: rename nf_flow_table.c to nf_flow_table_core.c Felix Fietkau
2018-02-17 11:12 ` [RFC 6/9] netfilter: nf_flow_table: move ipv4 offload hook code to nf_flow_table Felix Fietkau
2018-02-17 11:12 ` [RFC 7/9] netfilter: nf_flow_table: move ip header check out of nf_flow_exceeds_mtu Felix Fietkau
2018-02-17 11:12 ` [RFC 8/9] netfilter: nf_flow_table: move ipv6 offload hook code to nf_flow_table Felix Fietkau
2018-02-17 11:12 ` [RFC 9/9] netfilter: nf_flow_table: relax mixed ipv4/ipv6 flowtable dependencies Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180217111206.37312-1-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).