staging: rtl8723bs: use ether_addr_copy() and simplify NULL checks
PATCH v4 1/1 staging: rtl8723bs: use ether_addr_copy() and simplify NULL checks
This patch replaces multiple memcpy() calls with ether_addr_copy() for copying MAC/Ethernet addresses in rtl8723bs.
These changes improve code clarity, align with Linux kernel best practices, and fix checkpatch.pl warnings.
Tested by compiling the module successfully with:
make M=drivers/staging/rtl8723bs
---
v4: Fixed subject, corrected From email address, improved commit message format
v3: Removed redundant line number details from description
v2: Initial improvements for code style and checkpatch compliance
--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +17 -16
@@ -7,6 +7,7 @@#include <drv_types.h> #include <rtl8723b_hal.h> +#include <linux/etherdevice.h> #include "hal_com_h2c.h" #define MAX_H2C_BOX_NUMS 4
@@ -117,8 +118,8 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) *(fctrl) =0 ;eth_broadcast_addr (pwlanhdr->addr1); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (cur_network),ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr3,get_my_bssid (cur_network));SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );/* pmlmeext->mgnt_seq++; */
@@ -209,10 +210,10 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)SetDuration (pframe, (pmlmeinfo->aid |0xc000 ));/* BSSID. */ -memcpy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)));/* TA. */ -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); *pLength =16 ; }
@@ -246,21 +247,21 @@ static void ConstructNullFunctionData(switch (cur_network->network.infrastructure_mode) {case Ndis802_11Infrastructure:SetToDs (fctrl); -memcpy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3, StaAddr,ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network))); +ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr3, StaAddr);break ;case Ndis802_11APMode:SetFrDs (fctrl); -memcpy (pwlanhdr->addr1, StaAddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr1, StaAddr); +ether_addr_copy (pwlanhdr->addr2,get_my_bssid (&(pmlmeinfo->network))); +ether_addr_copy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)));break ;case Ndis802_11IBSS:default : -memcpy (pwlanhdr->addr1, StaAddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr1, StaAddr); +ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv))); +ether_addr_copy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)));break ; }
@@ -765,9 +766,9 @@ static void ConstructBtNullFunctionData(SetPwrMgt (fctrl);SetFrDs (fctrl); -memcpy (pwlanhdr->addr1, StaAddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&padapter->eeprompriv),ETH_ALEN ); +ether_addr_copy (pwlanhdr->addr1, StaAddr); +ether_addr_copy (pwlanhdr->addr2,myid (&padapter->eeprompriv)); +ether_addr_copy (pwlanhdr->addr3,myid (&padapter->eeprompriv));SetDuration (pwlanhdr,0 );SetSeqNum (pwlanhdr,0 );
Signature · 1 line
2.43.0
Greg KH
maintainerQuoted 2 lines · Dharanitharan R
This patch replaces multiple
memcpy()calls withether_addr_copy()for copying MAC/Ethernet addresses in rtl8723bs.
Take a look at the documentation for the kernel on how to write good changelog text. It's usually the hardest part of writing a patch. It says to not do things that say "this patch" and the like.
Also, your Subject doesn't make sense, there is no NULL checks happening here.
Quoted 3 lines
These changes improve code clarity, align with Linux kernel best practices, and fix checkpatch.pl warnings.
What warning is being handled?
Quoted 3 lines
Tested by compiling the module successfully with:
make M=drivers/staging/rtl8723bs
That doesn't always work, better to use:
make drivers/staging/rtl8723bs/
Also, that is always implied, and shouldn't be needed here :)
thanks,
greg k-h