9a038e7fd1
Copy config and patches from kernel 5.10 to kernel 5.15 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
23 lines
788 B
Diff
23 lines
788 B
Diff
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Sun, 18 Apr 2021 23:11:45 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: handle VLAN pop action
|
|
|
|
Do not hit EOPNOTSUPP when flowtable offload provides a VLAN pop action.
|
|
|
|
Fixes: efce49dfe6a8 ("netfilter: flowtable: add vlan pop action offload support")
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
|
@@ -233,6 +233,8 @@ mtk_flow_offload_replace(struct mtk_eth
|
|
data.vlan.proto = act->vlan.proto;
|
|
data.vlan.num++;
|
|
break;
|
|
+ case FLOW_ACTION_VLAN_POP:
|
|
+ break;
|
|
case FLOW_ACTION_PPPOE_PUSH:
|
|
if (data.pppoe.num == 1)
|
|
return -EOPNOTSUPP;
|