From: Robert Marko Date: Mon, 14 Aug 2023 16:42:18 +0000 (+0200) Subject: ipq40xx: qca807x: adapt for 6.1 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3d6d8bcd8fd13bc72a4670f9f209528f9b6d1a93;p=openwrt%2Fstaging%2Frobimarko.git ipq40xx: qca807x: adapt for 6.1 Kernel 6.1 has changed format of sfp_parse_support(), so lets adapt to those changes so it works on newer kernels as well. Signed-off-by: Robert Marko --- diff --git a/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c b/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c index 23b0ca74f7..abfc11e121 100644 --- a/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c +++ b/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c @@ -644,8 +644,13 @@ static int qca807x_sfp_insert(void *upstream, const struct sfp_eeprom_id *id) __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, }; phy_interface_t iface; int ret; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) + DECLARE_PHY_INTERFACE_MASK(interfaces); + sfp_parse_support(phydev->sfp_bus, id, support, interfaces); +#else sfp_parse_support(phydev->sfp_bus, id, support); +#endif iface = sfp_select_interface(phydev->sfp_bus, support); dev_info(&phydev->mdio.dev, "%s SFP module inserted\n", phy_modes(iface));