]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
gianfar: Handle error code at MAC address change
authorClaudiu Manoil <claudiu.manoil@nxp.com>
Mon, 29 Mar 2021 14:08:47 +0000 (17:08 +0300)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 4 May 2021 14:08:50 +0000 (16:08 +0200)
BugLink: https://bugs.launchpad.net/bugs/1926489
[ Upstream commit bff5b62585123823842833ab20b1c0a7fa437f8c ]

Handle return error code of eth_mac_addr();

Fixes: 3d23a05c75c7 ("gianfar: Enable changing mac addr when if up")
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/freescale/gianfar.c

index a8959a092344f5d8d9b98dd7371038b70d12cb8d..382a45d84cc326ae6016dc41882e0a2ce4e7557a 100644 (file)
@@ -366,7 +366,11 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num,
 
 static int gfar_set_mac_addr(struct net_device *dev, void *p)
 {
-       eth_mac_addr(dev, p);
+       int ret;
+
+       ret = eth_mac_addr(dev, p);
+       if (ret)
+               return ret;
 
        gfar_set_mac_for_addr(dev, 0, dev->dev_addr);