From 11cff41889a0382920cad69f2d96993878f2c6b1 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 18 Apr 2023 12:50:02 +0100 Subject: [PATCH] net: nvethernet: Fix build for Linux v6.3 Upstream commit 99d5fe9c7f3d ("net: mdio: Remove support for building C45 muxed addresses") removed the definition MII_ADDR_C45 breaking the build for the nvethernet driver for Linux v6.3. Update the driver to use the OSI_MII_ADDR_C45 instead. Bug 4014315 Bug 4075345 Change-Id: I98f8d10ce1a093d458d293b286a4e5a544d48d04 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2889876 Reviewed-by: Rohit Khanna GVS: Gerrit_Virtual_Submit --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index 2843d0e0..b4c91735 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -3688,7 +3688,7 @@ static int ether_handle_priv_rmdio_ioctl(struct ether_priv_data *pdata, if (mdio_phy_id_is_c45(mii_data->phy_id)) { prtad = mdio_phy_id_prtad(mii_data->phy_id); devad = mdio_phy_id_devad(mii_data->phy_id); - devad = MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | mii_data->reg_num; + devad = OSI_MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | mii_data->reg_num; } else { prtad = mii_data->phy_id; devad = mii_data->reg_num; @@ -3729,7 +3729,7 @@ static int ether_handle_priv_wmdio_ioctl(struct ether_priv_data *pdata, if (mdio_phy_id_is_c45(mii_data->phy_id)) { prtad = mdio_phy_id_prtad(mii_data->phy_id); devad = mdio_phy_id_devad(mii_data->phy_id); - devad = MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | mii_data->reg_num; + devad = OSI_MII_ADDR_C45 | devad << MII_DEVADDR_C45_SHIFT | mii_data->reg_num; } else { prtad = mii_data->phy_id; devad = mii_data->reg_num;