Commit c75a9ad4 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: fix incorrect mac address assignment 

The original changes brakes MAC address assignment on older chip
versions (see bug report [0]), and it brakes random MAC assignment.

is_valid_ether_addr() requires that its argument is word-aligned.
Add the missing alignment to array mac_addr.

[0] https://bugzilla.kernel.org/show_bug.cgi?id=215087



Fixes: 1c5d09d5 ("ethernet: r8169: use eth_hw_addr_set()")
Reported-by: default avatarRichard Herbert <rherbert@sympatico.ca>
Tested-by: default avatarRichard Herbert <rherbert@sympatico.ca>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52911bb6

drivers/net/ethernet/realtek/r8169_main.c

+3 −2
Original line number Diff line number Diff line
@@ -5217,8 +5217,8 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp) 


static void rtl_init_mac_address(struct rtl8169_private *tp)

{

	u8 mac_addr[ETH_ALEN] __aligned(2) = {};

	struct net_device *dev = tp->dev;

	u8 mac_addr[ETH_ALEN];

	int rc;



	rc = eth_platform_get_mac_address(tp_to_dev(tp), mac_addr);
@@ -5233,7 +5233,8 @@ static void rtl_init_mac_address(struct rtl8169_private *tp) 
	if (is_valid_ether_addr(mac_addr))

		goto done;



	eth_hw_addr_random(dev);

	eth_random_addr(mac_addr);

	dev->addr_assign_type = NET_ADDR_RANDOM;

	dev_warn(tp_to_dev(tp), "can't read MAC address, setting random one\n");

done:

	eth_hw_addr_set(dev, mac_addr);