From: Daniel Golle Date: Fri, 10 Apr 2026 19:58:36 +0000 (+0100) Subject: generic: 6.18: fix build of MediaTek USXGMII driver X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd02003162907f77314dbdbad545a8511402267a;p=thirdparty%2Fopenwrt.git generic: 6.18: fix build of MediaTek USXGMII driver Upstream changes to phylink require some small changes so the driver can build with Linux 6.18. Signed-off-by: Daniel Golle --- diff --git a/target/linux/generic/pending-6.18/739-05-net-pcs-add-driver-for-MediaTek-USXGMII-PCS.patch b/target/linux/generic/pending-6.18/739-05-net-pcs-add-driver-for-MediaTek-USXGMII-PCS.patch index 1bd628c333c..686c0293a1a 100644 --- a/target/linux/generic/pending-6.18/739-05-net-pcs-add-driver-for-MediaTek-USXGMII-PCS.patch +++ b/target/linux/generic/pending-6.18/739-05-net-pcs-add-driver-for-MediaTek-USXGMII-PCS.patch @@ -58,7 +58,7 @@ Signed-off-by: Daniel Golle +obj-$(CONFIG_PCS_MTK_USXGMII) += pcs-mtk-usxgmii.o --- /dev/null +++ b/drivers/net/pcs/pcs-mtk-usxgmii.c -@@ -0,0 +1,454 @@ +@@ -0,0 +1,453 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2023 MediaTek Inc. @@ -328,7 +328,7 @@ Signed-off-by: Daniel Golle + phylink_decode_usxgmii_word(state, lpa); +} + -+static void mtk_usxgmii_pcs_get_state(struct phylink_pcs *pcs, ++static void mtk_usxgmii_pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode, + struct phylink_link_state *state) +{ + struct mtk_usxgmii_pcs *mpcs = pcs_to_mtk_usxgmii_pcs(pcs); @@ -406,7 +406,6 @@ Signed-off-by: Daniel Golle + mpcs->dev = dev; + mpcs->pcs.ops = &mtk_usxgmii_pcs_ops; + mpcs->pcs.poll = true; -+ mpcs->pcs.neg_mode = true; + mpcs->interface = PHY_INTERFACE_MODE_NA; + mpcs->neg_mode = -1; +