kernel: add pending mtd patches adding NVMEM support
[openwrt/staging/rmilecki.git] / target / linux / generic / pending-5.10 / 640-16-netfilter-nft_flow_offload-fix-bridge-vlan-tag-handl.patch
1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Wed, 10 Feb 2021 10:23:38 +0100
3 Subject: [PATCH] netfilter: nft_flow_offload: fix bridge vlan tag handling
4
5 the brigde type uses the path->bridge.vlan_* fields
6
7 Signed-off-by: Felix Fietkau <nbd@nbd.name>
8 ---
9
10 --- a/net/netfilter/nft_flow_offload.c
11 +++ b/net/netfilter/nft_flow_offload.c
12 @@ -123,8 +123,8 @@ static void nft_dev_path_info(const stru
13
14 switch (path->bridge.vlan_mode) {
15 case DEV_PATH_BR_VLAN_TAG:
16 - info->vid[info->num_vlans] = path->vlan.id;
17 - info->vproto[info->num_vlans] = path->vlan.proto;
18 + info->vid[info->num_vlans] = path->bridge.vlan_id;
19 + info->vproto[info->num_vlans] = path->bridge.vlan_proto;
20 info->num_vlans++;
21 break;
22 case DEV_PATH_BR_VLAN_UNTAG: