tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Jakub Kicinski and committed by
Greg Kroah-Hartman e7c636f2 13898e93

+16 -9
+4 -1
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
··· 360 360 priv->eeprom_CustomerID); 361 361 362 362 if (!priv->AutoloadFailFlag) { 363 + u8 addr[ETH_ALEN]; 364 + 363 365 for (i = 0; i < 6; i += 2) { 364 366 usValue = rtl92e_eeprom_read(dev, 365 367 (EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1); 366 - *(u16 *)(&dev->dev_addr[i]) = usValue; 368 + *(u16 *)(&addr[i]) = usValue; 367 369 } 370 + eth_hw_addr_set(dev, addr); 368 371 } else { 369 372 eth_hw_addr_set(dev, bMac_Tmp_Addr); 370 373 }
+2 -2
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
··· 184 184 if (priv->rtllib->iw_mode == IW_MODE_ADHOC) { 185 185 rtl92e_set_key(dev, 4, 0, 186 186 priv->rtllib->pairwise_key_type, 187 - (u8 *)dev->dev_addr, 0, 187 + (const u8 *)dev->dev_addr, 0, 188 188 (u32 *)(&priv->rtllib->swcamtable[4].key_buf[0])); 189 189 } else { 190 190 rtl92e_set_key(dev, 4, 0, ··· 197 197 if (priv->rtllib->iw_mode == IW_MODE_ADHOC) { 198 198 rtl92e_set_key(dev, 4, 0, 199 199 priv->rtllib->pairwise_key_type, 200 - (u8 *)dev->dev_addr, 0, 200 + (const u8 *)dev->dev_addr, 0, 201 201 (u32 *)(&priv->rtllib->swcamtable[4].key_buf[0])); 202 202 } else { 203 203 rtl92e_set_key(dev, 4, 0,
+2 -1
drivers/staging/rtl8192u/r8192U.h
··· 1114 1114 void rtl819xusb_beacon_tx(struct net_device *dev, u16 tx_rate); 1115 1115 1116 1116 void EnableHWSecurityConfig8192(struct net_device *dev); 1117 - void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, u8 *MacAddr, u8 DefaultKey, u32 *KeyContent); 1117 + void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, 1118 + const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent); 1118 1119 1119 1120 #endif
+7 -4
drivers/staging/rtl8192u/r8192U_core.c
··· 2300 2300 /* set channelplan from eeprom */ 2301 2301 priv->ChannelPlan = priv->eeprom_ChannelPlan; 2302 2302 if (bLoad_From_EEPOM) { 2303 + u8 addr[ETH_ALEN]; 2304 + 2303 2305 for (i = 0; i < 6; i += 2) { 2304 2306 ret = eprom_read(dev, (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1)); 2305 2307 if (ret < 0) 2306 2308 return ret; 2307 - *(u16 *)(&dev->dev_addr[i]) = (u16)ret; 2309 + *(u16 *)(&addr[i]) = (u16)ret; 2308 2310 } 2311 + eth_hw_addr_set(dev, addr); 2309 2312 } else { 2310 2313 eth_hw_addr_set(dev, bMac_Tmp_Addr); 2311 2314 /* should I set IDR0 here? */ ··· 3048 3045 } else if (priv->ieee80211->pairwise_key_type == KEY_TYPE_TKIP) { 3049 3046 if (priv->ieee80211->iw_mode == IW_MODE_ADHOC) 3050 3047 setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type, 3051 - (u8 *)dev->dev_addr, 0, NULL); 3048 + (const u8 *)dev->dev_addr, 0, NULL); 3052 3049 else 3053 3050 setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type, 3054 3051 MacAddr, 0, NULL); 3055 3052 } else if (priv->ieee80211->pairwise_key_type == KEY_TYPE_CCMP) { 3056 3053 if (priv->ieee80211->iw_mode == IW_MODE_ADHOC) 3057 3054 setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type, 3058 - (u8 *)dev->dev_addr, 0, NULL); 3055 + (const u8 *)dev->dev_addr, 0, NULL); 3059 3056 else 3060 3057 setKey(dev, 4, 0, priv->ieee80211->pairwise_key_type, 3061 3058 MacAddr, 0, NULL); ··· 4871 4868 } 4872 4869 4873 4870 void setKey(struct net_device *dev, u8 entryno, u8 keyindex, u16 keytype, 4874 - u8 *macaddr, u8 defaultkey, u32 *keycontent) 4871 + const u8 *macaddr, u8 defaultkey, u32 *keycontent) 4875 4872 { 4876 4873 u32 target_command = 0; 4877 4874 u32 target_content = 0;
+1 -1
drivers/staging/rtl8723bs/os_dep/os_intfs.c
··· 283 283 if (!padapter->bup) { 284 284 /* addr->sa_data[4], addr->sa_data[5]); */ 285 285 memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); 286 - /* memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); */ 286 + /* eth_hw_addr_set(pnetdev, addr->sa_data); */ 287 287 /* padapter->bset_hwaddr = true; */ 288 288 } 289 289