diff options
| author | Felix Fietkau <nbd@nbd.name> | 2019-09-25 16:45:05 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2019-09-26 10:25:01 +0200 |
| commit | 151bd9ee259647819c5834b5ce80b3327d967e09 (patch) | |
| tree | c6a44d17fb424615ae0a38fa54fd67f996de6d28 /target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch | |
| parent | ac04be82c447e3a24bbd05387b76228673b7729b (diff) | |
| download | upstream-151bd9ee259647819c5834b5ce80b3327d967e09.tar.gz upstream-151bd9ee259647819c5834b5ce80b3327d967e09.tar.bz2 upstream-151bd9ee259647819c5834b5ce80b3327d967e09.zip | |
kernel: port upstream nft_flow_offload changes to xt_FLOWOFFLOAD and fix routing issues
Replace an old cleanup patch that never made it upstream with the proper
upstream fix. This patch was incompatible with the recent changes that
affected the way that the flow tuple dst entry was used.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry-picked from commits 442ecce76169d and c8933ce533656)
Diffstat (limited to 'target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch')
| -rw-r--r-- | target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch b/target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch index 290570fe9f..f58b8bc716 100644 --- a/target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch +++ b/target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch @@ -1,6 +1,6 @@ --- a/include/net/netfilter/nf_flow_table.h +++ b/include/net/netfilter/nf_flow_table.h -@@ -164,6 +164,8 @@ struct nf_flow_table_hw { +@@ -163,6 +163,8 @@ struct nf_flow_table_hw { int nf_flow_table_hw_register(const struct nf_flow_table_hw *offload); void nf_flow_table_hw_unregister(const struct nf_flow_table_hw *offload); @@ -19,7 +19,7 @@ struct flow_offload_entry { struct flow_offload flow; -@@ -151,6 +152,22 @@ void flow_offload_free(struct flow_offlo +@@ -152,6 +153,22 @@ void flow_offload_free(struct flow_offlo } EXPORT_SYMBOL_GPL(flow_offload_free); |