[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <dleftja6i1fywf.fsf%l.stelmach@samsung.com>
Date: Thu, 18 Nov 2021 13:09:52 +0100
From: Lukasz Stelmach <l.stelmach@...sung.com>
To: Jakub Kicinski <kuba@...nel.org>
Cc: davem@...emloft.net, netdev@...r.kernel.org
Subject: Re: [PATCH net-next 1/9] net: ax88796c: don't write to
netdev->dev_addr directly
It was <2021-11-17 śro 20:14>, when Jakub Kicinski wrote:
> The future is here, convert the new driver as we are about
> to make netdev->dev_addr const.
>
> Signed-off-by: Jakub Kicinski <kuba@...nel.org>
> ---
> CC: l.stelmach@...sung.com
> ---
> drivers/net/ethernet/asix/ax88796c_main.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
Acked-by: Lukasz Stelmach <l.stelmach@...sung.com>
> diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
> index e230d8d0ff73..e7a9f9863258 100644
> --- a/drivers/net/ethernet/asix/ax88796c_main.c
> +++ b/drivers/net/ethernet/asix/ax88796c_main.c
> @@ -144,12 +144,13 @@ static void ax88796c_set_mac_addr(struct net_device *ndev)
> static void ax88796c_load_mac_addr(struct net_device *ndev)
> {
> struct ax88796c_device *ax_local = to_ax88796c_device(ndev);
> + u8 addr[ETH_ALEN];
> u16 temp;
>
> lockdep_assert_held(&ax_local->spi_lock);
>
> /* Try the device tree first */
> - if (!eth_platform_get_mac_address(&ax_local->spi->dev, ndev->dev_addr) &&
> + if (!platform_get_ethdev_address(&ax_local->spi->dev, ndev) &&
> is_valid_ether_addr(ndev->dev_addr)) {
> if (netif_msg_probe(ax_local))
> dev_info(&ax_local->spi->dev,
> @@ -159,18 +160,19 @@ static void ax88796c_load_mac_addr(struct net_device *ndev)
>
> /* Read the MAC address from AX88796C */
> temp = AX_READ(&ax_local->ax_spi, P3_MACASR0);
> - ndev->dev_addr[5] = (u8)temp;
> - ndev->dev_addr[4] = (u8)(temp >> 8);
> + addr[5] = (u8)temp;
> + addr[4] = (u8)(temp >> 8);
>
> temp = AX_READ(&ax_local->ax_spi, P3_MACASR1);
> - ndev->dev_addr[3] = (u8)temp;
> - ndev->dev_addr[2] = (u8)(temp >> 8);
> + addr[3] = (u8)temp;
> + addr[2] = (u8)(temp >> 8);
>
> temp = AX_READ(&ax_local->ax_spi, P3_MACASR2);
> - ndev->dev_addr[1] = (u8)temp;
> - ndev->dev_addr[0] = (u8)(temp >> 8);
> + addr[1] = (u8)temp;
> + addr[0] = (u8)(temp >> 8);
>
> - if (is_valid_ether_addr(ndev->dev_addr)) {
> + if (is_valid_ether_addr(addr)) {
> + eth_hw_addr_set(ndev, addr);
> if (netif_msg_probe(ax_local))
> dev_info(&ax_local->spi->dev,
> "MAC address read from ASIX chip\n");
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
Download attachment "signature.asc" of type "application/pgp-signature" (488 bytes)
Powered by blists - more mailing lists