diff options
Diffstat (limited to 'target/linux/generic/backport-4.14/361-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/361-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/target/linux/generic/backport-4.14/361-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch b/target/linux/generic/backport-4.14/361-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch index 83751d8cb1..30cebfac60 100644 --- a/target/linux/generic/backport-4.14/361-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch +++ b/target/linux/generic/backport-4.14/361-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch @@ -19,21 +19,30 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> struct flow_offload { struct flow_offload_tuple_rhash tuplehash[FLOW_OFFLOAD_DIR_MAX]; -@@ -108,6 +109,11 @@ static inline void flow_offload_dead(str +@@ -103,6 +104,7 @@ void nf_flow_table_cleanup(struct net *n + int nf_flow_table_init(struct nf_flowtable *flow_table); + void nf_flow_table_free(struct nf_flowtable *flow_table); + ++void flow_offload_teardown(struct flow_offload *flow); + static inline void flow_offload_dead(struct flow_offload *flow) + { flow->flags |= FLOW_OFFLOAD_DYING; +--- a/net/netfilter/nf_flow_table_core.c ++++ b/net/netfilter/nf_flow_table_core.c +@@ -174,6 +174,12 @@ static void flow_offload_del(struct nf_f + flow_offload_free(flow); } -+static inline void flow_offload_teardown(struct flow_offload *flow) ++void flow_offload_teardown(struct flow_offload *flow) +{ + flow->flags |= FLOW_OFFLOAD_TEARDOWN; +} ++EXPORT_SYMBOL_GPL(flow_offload_teardown); + - int nf_flow_snat_port(const struct flow_offload *flow, - struct sk_buff *skb, unsigned int thoff, - u8 protocol, enum flow_offload_tuple_dir dir); ---- a/net/netfilter/nf_flow_table_core.c -+++ b/net/netfilter/nf_flow_table_core.c -@@ -226,11 +226,6 @@ static inline bool nf_flow_has_expired(c + struct flow_offload_tuple_rhash * + flow_offload_lookup(struct nf_flowtable *flow_table, + struct flow_offload_tuple *tuple) +@@ -226,11 +232,6 @@ static inline bool nf_flow_has_expired(c return (__s32)(flow->timeout - (u32)jiffies) <= 0; } @@ -45,7 +54,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int nf_flow_offload_gc_step(struct nf_flowtable *flow_table) { struct flow_offload_tuple_rhash *tuplehash; -@@ -258,7 +253,8 @@ static int nf_flow_offload_gc_step(struc +@@ -258,7 +259,8 @@ static int nf_flow_offload_gc_step(struc flow = container_of(tuplehash, struct flow_offload, tuplehash[0]); if (nf_flow_has_expired(flow) || @@ -55,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> flow_offload_del(flow_table, flow); } out: -@@ -419,10 +415,14 @@ static void nf_flow_table_do_cleanup(str +@@ -419,10 +421,14 @@ static void nf_flow_table_do_cleanup(str { struct net_device *dev = data; |