Commit d2a6e48e authored Sep 02, 2017 by Antoine Tenart Committed by David S. Miller Sep 03, 2017

net: mvpp2: fix use of the random mac address for PPv2.2



The MAC retrieval logic is using a variable to store an h/w stored mac
address and checks this mac against invalid ones before using it. But
the mac address is only read from h/w when using PPv2.1. So when using
PPv2.2 it defaults to its init state.

This patches fixes the logic to only check if the h/w mac is valid when
actually retrieving a mac from h/w.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3ba8c81e

drivers/net/ethernet/marvell/mvpp2.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -7478,17 +7478,19 @@ static void mvpp2_port_copy_mac_addr(struct net_device dev, struct mvpp2 priv,
		*mac_from = "device tree";
		ether_addr_copy(dev->dev_addr, dt_mac_addr);
		} else {
		if (priv->hw_version == MVPP21)
		if (priv->hw_version == MVPP21) {
		mvpp21_get_mac_address(port, hw_mac_addr);
		if (is_valid_ether_addr(hw_mac_addr)) {
		*mac_from = "hardware";
		ether_addr_copy(dev->dev_addr, hw_mac_addr);
		} else {
		return;
		}
		}

		*mac_from = "random";
		eth_hw_addr_random(dev);
		}
		}
		}

		/* Ports initialization */
		static int mvpp2_port_probe(struct platform_device *pdev,