kernel: mark source kernel for netfilter backports
[openwrt/openwrt.git] / target / linux / generic / backport-4.14 / 348-v4.18-netfilter-nf_flow_table-use-IP_CT_DIR_-values-for-FL.patch
1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Fri, 16 Feb 2018 09:41:18 +0100
3 Subject: [PATCH] netfilter: nf_flow_table: use IP_CT_DIR_* values for
4 FLOW_OFFLOAD_DIR_*
5
6 Simplifies further code cleanups
7
8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 ---
10
11 --- a/include/net/netfilter/nf_flow_table.h
12 +++ b/include/net/netfilter/nf_flow_table.h
13 @@ -6,6 +6,7 @@
14 #include <linux/netdevice.h>
15 #include <linux/rhashtable.h>
16 #include <linux/rcupdate.h>
17 +#include <linux/netfilter/nf_conntrack_tuple_common.h>
18 #include <net/dst.h>
19
20 struct nf_flowtable;
21 @@ -27,11 +28,10 @@ struct nf_flowtable {
22 };
23
24 enum flow_offload_tuple_dir {
25 - FLOW_OFFLOAD_DIR_ORIGINAL,
26 - FLOW_OFFLOAD_DIR_REPLY,
27 - __FLOW_OFFLOAD_DIR_MAX = FLOW_OFFLOAD_DIR_REPLY,
28 + FLOW_OFFLOAD_DIR_ORIGINAL = IP_CT_DIR_ORIGINAL,
29 + FLOW_OFFLOAD_DIR_REPLY = IP_CT_DIR_REPLY,
30 + FLOW_OFFLOAD_DIR_MAX = IP_CT_DIR_MAX
31 };
32 -#define FLOW_OFFLOAD_DIR_MAX (__FLOW_OFFLOAD_DIR_MAX + 1)
33
34 struct flow_offload_tuple {
35 union {