From 2c2e1dfb9e50fae11446a5459ed635190b32117e Mon Sep 17 00:00:00 2001 From: Revanth Kumar Uppala Date: Wed, 3 May 2023 17:32:36 +0530 Subject: [PATCH] nvethernet: Correct the if-else condition to copy mac address Address setting helpers are used to copy mac address from K5.17 as netdev->dev_addr is constant from K5.17.Adding an else condition now so that memcpy will be used for Kernel versions below K5.17 Bug 4076818 Change-Id: I1542a82710aa2bdf12bfc93fdaedf31d34df91b2 Signed-off-by: Revanth Kumar Uppala Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2897883 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/net/ethernet/nvidia/nvethernet/ether_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index cfe519f2..a227a514 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -4751,12 +4751,12 @@ static int ether_get_mac_address(struct ether_priv_data *pdata) eth_mac_addr = addr; } + /* Found a valid mac address */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) dev_addr_mod(ndev, 0, eth_mac_addr, ETH_ALEN); -#endif - - /* Found a valid mac address */ +#else memcpy(ndev->dev_addr, eth_mac_addr, ETH_ALEN); +#endif memcpy(osi_core->mac_addr, eth_mac_addr, ETH_ALEN); dev_info(dev, "Ethernet MAC address: %pM\n", ndev->dev_addr);