wilc1000: use eth_hw_addr_set()

Commit 406f42fa0d3c ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it got through appropriate helpers.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211018235021.1279697-13-kuba@kernel.org

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c
index d3b33c6ab93afff1b1b855da5a7b9d6584831038..690572e01a2a7220df9879bcd135a1ef21f7348b 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@ -111,7 +111,8 @@ out:
        return ndev;
 }
 
-void wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode)
+void wilc_wlan_set_bssid(struct net_device *wilc_netdev, const u8 *bssid,
+                        u8 mode)
 {
        struct wilc_vif *vif = netdev_priv(wilc_netdev);
 
@@ -594,10 +595,14 @@ static int wilc_mac_open(struct net_device *ndev)
        wilc_set_operation_mode(vif, wilc_get_vif_idx(vif), vif->iftype,
                                vif->idx);
 
-       if (is_valid_ether_addr(ndev->dev_addr))
+       if (is_valid_ether_addr(ndev->dev_addr)) {
                wilc_set_mac_address(vif, ndev->dev_addr);
-       else
-               wilc_get_mac_address(vif, ndev->dev_addr);
+       } else {
+               u8 addr[ETH_ALEN];
+
+               wilc_get_mac_address(vif, addr);
+               eth_hw_addr_set(ndev, addr);
+       }
        netdev_dbg(ndev, "Mac address: %pM\n", ndev->dev_addr);
 
        if (!is_valid_ether_addr(ndev->dev_addr)) {

diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.h b/drivers/net/wireless/microchip/wilc1000/netdev.h
index 79f73a72da57629cf3b9cc19843a7f974d6685ca..b9a88b3e322f1332670b7df2c7bfd7e38f314725 100644 (file)
--- a/drivers/net/wireless/microchip/wilc1000/netdev.h
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.h
@@ -287,7 +287,8 @@ void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);
 void wilc_mac_indicate(struct wilc *wilc);
 void wilc_netdev_cleanup(struct wilc *wilc);
 void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
-void wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid, u8 mode);
+void wilc_wlan_set_bssid(struct net_device *wilc_netdev, const u8 *bssid,
+                        u8 mode);
 struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
                                      int vif_type, enum nl80211_iftype type,
                                      bool rtnl_locked);