Commit 0341ae70 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Kalle Valo

wilc1000: use eth_hw_addr_set()

Commit 406f42fa ("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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211018235021.1279697-13-kuba@kernel.org
parent 2202c2f4
...@@ -111,7 +111,8 @@ static struct net_device *get_if_handler(struct wilc *wilc, u8 *mac_header) ...@@ -111,7 +111,8 @@ static struct net_device *get_if_handler(struct wilc *wilc, u8 *mac_header)
return ndev; 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); struct wilc_vif *vif = netdev_priv(wilc_netdev);
...@@ -594,10 +595,14 @@ static int wilc_mac_open(struct net_device *ndev) ...@@ -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, wilc_set_operation_mode(vif, wilc_get_vif_idx(vif), vif->iftype,
vif->idx); 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); wilc_set_mac_address(vif, ndev->dev_addr);
else } else {
wilc_get_mac_address(vif, ndev->dev_addr); 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); netdev_dbg(ndev, "Mac address: %pM\n", ndev->dev_addr);
if (!is_valid_ether_addr(ndev->dev_addr)) { if (!is_valid_ether_addr(ndev->dev_addr)) {
......
...@@ -287,7 +287,8 @@ void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); ...@@ -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_mac_indicate(struct wilc *wilc);
void wilc_netdev_cleanup(struct wilc *wilc); void wilc_netdev_cleanup(struct wilc *wilc);
void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size); 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, struct wilc_vif *wilc_netdev_ifc_init(struct wilc *wl, const char *name,
int vif_type, enum nl80211_iftype type, int vif_type, enum nl80211_iftype type,
bool rtnl_locked); bool rtnl_locked);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment