You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
966 B
Diff
36 lines
966 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 16 Feb 2018 09:41:18 +0100
|
|
Subject: [PATCH] netfilter: nf_flow_table: use IP_CT_DIR_* values for
|
|
FLOW_OFFLOAD_DIR_*
|
|
|
|
Simplifies further code cleanups
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- 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;
|
|
@@ -27,11 +28,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 {
|