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

Commit 8ba789ab authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: change the location of rtl8152_set_mac_address 



Exchange the location of rtl8152_set_mac_address() and
set_ethernet_addr(). Then, the set_ethernet_addr() could
set the MAC address by calling rtl8152_set_mac_address()
later.

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

drivers/net/usb/r8152.c

+17 −17
Original line number Diff line number Diff line
@@ -975,6 +975,23 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val) 
static int

r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags);



static int rtl8152_set_mac_address(struct net_device *netdev, void *p)

{

	struct r8152 *tp = netdev_priv(netdev);

	struct sockaddr *addr = p;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);



	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);

	pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);

	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);



	return 0;

}



static inline void set_ethernet_addr(struct r8152 *tp)

{

	struct net_device *dev = tp->netdev;
@@ -1003,23 +1020,6 @@ static inline void set_ethernet_addr(struct r8152 *tp) 
	}

}



static int rtl8152_set_mac_address(struct net_device *netdev, void *p)

{

	struct r8152 *tp = netdev_priv(netdev);

	struct sockaddr *addr = p;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);



	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);

	pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);

	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);



	return 0;

}



static void read_bulk_callback(struct urb *urb)

{

	struct net_device *netdev;