diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-10-19 10:12:42 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-20 19:33:59 +0200 |
commit | e7c636f2bb50367581bec53782fb15ebf8648936 (patch) | |
tree | 44a6675308b40878b62d098449227b1e41952f6d /drivers/staging/rtl8192e | |
parent | staging: unisys: use eth_hw_addr_set() (diff) | |
download | linux-dev-e7c636f2bb50367581bec53782fb15ebf8648936.tar.xz linux-dev-e7c636f2bb50367581bec53782fb15ebf8648936.zip |
staging: rtl: 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>
Link: https://lore.kernel.org/r/20211019171243.1412240-8-kuba@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index cfeaa9c1542f..7f9dee42a04d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -360,11 +360,14 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->eeprom_CustomerID); if (!priv->AutoloadFailFlag) { + u8 addr[ETH_ALEN]; + for (i = 0; i < 6; i += 2) { usValue = rtl92e_eeprom_read(dev, (EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1); - *(u16 *)(&dev->dev_addr[i]) = usValue; + *(u16 *)(&addr[i]) = usValue; } + eth_hw_addr_set(dev, addr); } else { eth_hw_addr_set(dev, bMac_Tmp_Addr); } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c index f75a12543781..d7630f02a910 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -184,7 +184,7 @@ void rtl92e_cam_restore(struct net_device *dev) if (priv->rtllib->iw_mode == IW_MODE_ADHOC) { rtl92e_set_key(dev, 4, 0, priv->rtllib->pairwise_key_type, - (u8 *)dev->dev_addr, 0, + (const u8 *)dev->dev_addr, 0, (u32 *)(&priv->rtllib->swcamtable[4].key_buf[0])); } else { rtl92e_set_key(dev, 4, 0, @@ -197,7 +197,7 @@ void rtl92e_cam_restore(struct net_device *dev) if (priv->rtllib->iw_mode == IW_MODE_ADHOC) { rtl92e_set_key(dev, 4, 0, priv->rtllib->pairwise_key_type, - (u8 *)dev->dev_addr, 0, + (const u8 *)dev->dev_addr, 0, (u32 *)(&priv->rtllib->swcamtable[4].key_buf[0])); } else { rtl92e_set_key(dev, 4, 0, |