diff options
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-58-netfilter-flowtable-Add-FLOW_OFFLOAD_XMIT_UNSPEC-xmi.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-58-netfilter-flowtable-Add-FLOW_OFFLOAD_XMIT_UNSPEC-xmi.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-58-netfilter-flowtable-Add-FLOW_OFFLOAD_XMIT_UNSPEC-xmi.patch b/target/linux/generic/backport-5.10/610-v5.13-58-netfilter-flowtable-Add-FLOW_OFFLOAD_XMIT_UNSPEC-xmi.patch deleted file mode 100644 index 62edb2c811..0000000000 --- a/target/linux/generic/backport-5.10/610-v5.13-58-netfilter-flowtable-Add-FLOW_OFFLOAD_XMIT_UNSPEC-xmi.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 78ed0a9bc6db76f8e5f5f4cb0d2b2f0d1bb21b24 Mon Sep 17 00:00:00 2001 -From: Roi Dayan <roid@nvidia.com> -Date: Tue, 13 Apr 2021 11:06:05 +0300 -Subject: [PATCH] netfilter: flowtable: Add FLOW_OFFLOAD_XMIT_UNSPEC xmit type - -It could be xmit type was not set and would default to FLOW_OFFLOAD_XMIT_NEIGH -and in this type the gc expect to have a route info. -Fix that by adding FLOW_OFFLOAD_XMIT_UNSPEC which defaults to 0. - -Fixes: 8b9229d15877 ("netfilter: flowtable: dst_check() from garbage collector path") -Signed-off-by: Roi Dayan <roid@nvidia.com> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/net/netfilter/nf_flow_table.h | 3 ++- - net/netfilter/nf_flow_table_core.c | 3 +++ - 2 files changed, 5 insertions(+), 1 deletion(-) - ---- a/include/net/netfilter/nf_flow_table.h -+++ b/include/net/netfilter/nf_flow_table.h -@@ -90,7 +90,8 @@ enum flow_offload_tuple_dir { - #define FLOW_OFFLOAD_DIR_MAX IP_CT_DIR_MAX - - enum flow_offload_xmit_type { -- FLOW_OFFLOAD_XMIT_NEIGH = 0, -+ FLOW_OFFLOAD_XMIT_UNSPEC = 0, -+ FLOW_OFFLOAD_XMIT_NEIGH, - FLOW_OFFLOAD_XMIT_XFRM, - FLOW_OFFLOAD_XMIT_DIRECT, - }; ---- a/net/netfilter/nf_flow_table_core.c -+++ b/net/netfilter/nf_flow_table_core.c -@@ -130,6 +130,9 @@ static int flow_offload_fill_route(struc - flow_tuple->dst_cache = dst; - flow_tuple->dst_cookie = flow_offload_dst_cookie(flow_tuple); - break; -+ default: -+ WARN_ON_ONCE(1); -+ break; - } - flow_tuple->xmit_type = route->tuple[dir].xmit_type; - |