diff options
| author | David S. Miller <davem@davemloft.net> | 2021-11-19 10:46:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-19 10:46:04 +0000 |
| commit | 82f60a011c5f7287f06241f7720739b51d5da6fc (patch) | |
| tree | b896aed809c1c188fee9ee426b340dafbcf3ca1c /drivers/net/wireless/microchip | |
| parent | 3b1abcf1289466eca4c46db8b55c06422f0abf34 (diff) | |
| parent | a608e6794b080594590c52d2e373068d5148954c (diff) | |
Merge branch 'dev_addr-const-x86'
Jakub Kicinski says:
====================
net: constify netdev->dev_addr - x86 changes
Resending these so they can get merged while I battle random cross builds.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/microchip')
| -rw-r--r-- | drivers/net/wireless/microchip/wilc1000/netdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/microchip/wilc1000/netdev.c b/drivers/net/wireless/microchip/wilc1000/netdev.c index 690572e01a2a..4712cd7dff9f 100644 --- a/drivers/net/wireless/microchip/wilc1000/netdev.c +++ b/drivers/net/wireless/microchip/wilc1000/netdev.c @@ -574,6 +574,7 @@ static int wilc_mac_open(struct net_device *ndev) struct wilc *wl = vif->wilc; int ret = 0; struct mgmt_frame_regs mgmt_regs = {}; + u8 addr[ETH_ALEN] __aligned(2); if (!wl || !wl->dev) { netdev_err(ndev, "device not ready\n"); @@ -596,10 +597,9 @@ static int wilc_mac_open(struct net_device *ndev) vif->idx); if (is_valid_ether_addr(ndev->dev_addr)) { - wilc_set_mac_address(vif, ndev->dev_addr); + ether_addr_copy(addr, ndev->dev_addr); + wilc_set_mac_address(vif, addr); } else { - u8 addr[ETH_ALEN]; - wilc_get_mac_address(vif, addr); eth_hw_addr_set(ndev, addr); } |