kernel: 5.10: update nvmem subsystem to the 5.15 state
[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 610-v5.13-23-netfilter-flowtable-add-dsa-support.patch
1 From: Pablo Neira Ayuso <pablo@netfilter.org>
2 Date: Wed, 24 Mar 2021 02:30:44 +0100
3 Subject: [PATCH] netfilter: flowtable: add dsa support
4
5 Replace the master ethernet device by the dsa slave port. Packets coming
6 in from the software ingress path use the dsa slave port as input
7 device.
8
9 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
10 ---
11
12 --- a/net/netfilter/nft_flow_offload.c
13 +++ b/net/netfilter/nft_flow_offload.c
14 @@ -89,6 +89,7 @@ static void nft_dev_path_info(const stru
15 path = &stack->path[i];
16 switch (path->type) {
17 case DEV_PATH_ETHERNET:
18 + case DEV_PATH_DSA:
19 case DEV_PATH_VLAN:
20 case DEV_PATH_PPPOE:
21 info->indev = path->dev;
22 @@ -97,6 +98,10 @@ static void nft_dev_path_info(const stru
23
24 if (path->type == DEV_PATH_ETHERNET)
25 break;
26 + if (path->type == DEV_PATH_DSA) {
27 + i = stack->num_paths;
28 + break;
29 + }
30
31 /* DEV_PATH_VLAN and DEV_PATH_PPPOE */
32 if (info->num_encaps >= NF_FLOW_TABLE_ENCAP_MAX) {