mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
29 lines
898 B
Diff
29 lines
898 B
Diff
|
From: Jakub Kicinski <kuba@kernel.org>
|
||
|
|
Date: Thu, 19 May 2022 18:25:55 -0700
|
||
|
|
Subject: [PATCH] eth: mtk_ppe: fix up after merge
|
||
|
|
|
||
|
|
I missed this in the barrage of GCC 12 warnings. Commit cf2df74e202d
|
||
|
|
("net: fix dev_fill_forward_path with pppoe + bridge") changed
|
||
|
|
the pointer into an array.
|
||
|
|
|
||
|
|
Fixes: d7e6f5836038 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
|
||
|
|
Link: https://lore.kernel.org/r/20220520012555.2262461-1-kuba@kernel.org
|
||
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
||
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
|
||
|
|
@@ -90,10 +90,11 @@ mtk_flow_get_wdma_info(struct net_device
|
||
|
|
{
|
||
|
|
struct net_device_path_ctx ctx = {
|
||
|
|
.dev = dev,
|
||
|
|
- .daddr = addr,
|
||
|
|
};
|
||
|
|
struct net_device_path path = {};
|
||
|
|
|
||
|
|
+ memcpy(ctx.daddr, addr, sizeof(ctx.daddr));
|
||
|
|
+
|
||
|
|
if (!IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED))
|
||
|
|
return -1;
|
||
|
|
|