diff options
| author | Felix Fietkau <nbd@nbd.name> | 2019-09-25 19:39:51 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2019-09-25 20:11:20 +0200 |
| commit | c8933ce53365671de98a303c8d94e089ea76754e (patch) | |
| tree | 092a41293c39a5b697a007be07d898cd3d31b72f /target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch | |
| parent | 442ecce76169d362b1c7ec4ba0a0e099dcbc8e29 (diff) | |
| download | upstream-c8933ce53365671de98a303c8d94e089ea76754e.tar.gz upstream-c8933ce53365671de98a303c8d94e089ea76754e.tar.bz2 upstream-c8933ce53365671de98a303c8d94e089ea76754e.zip | |
kernel: fix issues with output routing in flow offload
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>
Diffstat (limited to 'target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch')
| -rw-r--r-- | target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch b/target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch index cf0a431a58..f0a8b19eec 100644 --- a/target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch +++ b/target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch @@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/netfilter/nft_flow_offload.c +++ b/net/netfilter/nft_flow_offload.c -@@ -28,9 +28,11 @@ nft_flow_dst(const struct nf_conn *ct, e +@@ -30,9 +30,11 @@ static int nft_flow_route(const struct n switch (nft_pf(pkt)) { case NFPROTO_IPV4: fl.u.ip4.daddr = ct->tuplehash[dir].tuple.src.u3.ip; @@ -74,7 +74,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> break; } -@@ -52,9 +54,7 @@ static int nft_flow_route(const struct n +@@ -41,9 +43,7 @@ static int nft_flow_route(const struct n return -ENOENT; route->tuple[dir].dst = this_dst; |