Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 179bb6d7 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: use eth_hw_addr_random 



If the hw doesn't have a valid MAC address, give a random one and
set it to the hw.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ba789ab

drivers/net/usb/r8152.c

+19 −16
Original line number Diff line number Diff line
@@ -992,32 +992,35 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p) 
	return 0;

}



static inline void set_ethernet_addr(struct r8152 *tp)

static int set_ethernet_addr(struct r8152 *tp)

{

	struct net_device *dev = tp->netdev;

	struct sockaddr sa;

	int ret;

	u8 node_id[8] = {0};



	if (tp->version == RTL_VER_01)

		ret = pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id);

		ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);

	else

		ret = pla_ocp_read(tp, PLA_BACKUP, sizeof(node_id), node_id);

		ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);



	if (ret < 0) {

		netif_notice(tp, probe, dev, "inet addr fail\n");

		netif_err(tp, probe, dev, "Get ether addr fail\n");

	} else if (!is_valid_ether_addr(sa.sa_data)) {

		netif_err(tp, probe, dev, "Invalid ether addr %pM\n",

			  sa.sa_data);

		eth_hw_addr_random(dev);

		ether_addr_copy(sa.sa_data, dev->dev_addr);

		ret = rtl8152_set_mac_address(dev, &sa);

		netif_info(tp, probe, dev, "Random ether addr %pM\n",

			   sa.sa_data);

	} else {

		if (tp->version != RTL_VER_01) {

			ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR,

				       CRWECR_CONFIG);

			pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES,

				      sizeof(node_id), node_id);

			ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR,

				       CRWECR_NORAML);

		if (tp->version == RTL_VER_01)

			ether_addr_copy(dev->dev_addr, sa.sa_data);

		else

			ret = rtl8152_set_mac_address(dev, &sa);

	}



		memcpy(dev->dev_addr, node_id, dev->addr_len);

		memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);

	}

	return ret;

}



static void read_bulk_callback(struct urb *urb)