27c9d80f51
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 21 Feb 2022 15:55:19 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: remove bridge flow offload
|
|
type entry support
|
|
|
|
According to MediaTek, this feature is not supported in current hardware
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
@@ -84,13 +84,6 @@ static u32 mtk_ppe_hash_entry(struct mtk
|
|
u32 hash;
|
|
|
|
switch (FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, e->ib1)) {
|
|
- case MTK_PPE_PKT_TYPE_BRIDGE:
|
|
- hv1 = e->bridge.src_mac_lo;
|
|
- hv1 ^= ((e->bridge.src_mac_hi & 0xffff) << 16);
|
|
- hv2 = e->bridge.src_mac_hi >> 16;
|
|
- hv2 ^= e->bridge.dest_mac_lo;
|
|
- hv3 = e->bridge.dest_mac_hi;
|
|
- break;
|
|
case MTK_PPE_PKT_TYPE_IPV4_ROUTE:
|
|
case MTK_PPE_PKT_TYPE_IPV4_HNAPT:
|
|
hv1 = e->ipv4.orig.ports;
|
|
@@ -572,7 +565,6 @@ int mtk_ppe_start(struct mtk_ppe *ppe)
|
|
MTK_PPE_FLOW_CFG_IP4_NAT |
|
|
MTK_PPE_FLOW_CFG_IP4_NAPT |
|
|
MTK_PPE_FLOW_CFG_IP4_DSLITE |
|
|
- MTK_PPE_FLOW_CFG_L2_BRIDGE |
|
|
MTK_PPE_FLOW_CFG_IP4_NAT_FRAG;
|
|
ppe_w32(ppe, MTK_PPE_FLOW_CFG, val);
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c
|
|
@@ -32,7 +32,6 @@ static const char *mtk_foe_pkt_type_str(
|
|
static const char * const type_str[] = {
|
|
[MTK_PPE_PKT_TYPE_IPV4_HNAPT] = "IPv4 5T",
|
|
[MTK_PPE_PKT_TYPE_IPV4_ROUTE] = "IPv4 3T",
|
|
- [MTK_PPE_PKT_TYPE_BRIDGE] = "L2",
|
|
[MTK_PPE_PKT_TYPE_IPV4_DSLITE] = "DS-LITE",
|
|
[MTK_PPE_PKT_TYPE_IPV6_ROUTE_3T] = "IPv6 3T",
|
|
[MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T] = "IPv6 5T",
|