net:drivers/net: Miscellaneous conversions to ETH_ALEN
Convert the memset/memcpy uses of 6 to ETH_ALEN where appropriate. Also convert some struct definitions and u8 array declarations of [6] to ETH_ALEN. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
0b3d8e087b
commit
d458cdf712
@@ -453,7 +453,7 @@ static void directed_beacon(struct s_smc *smc)
|
||||
*/
|
||||
* (char *) a = (char) ((long)DBEACON_INFO<<24L) ;
|
||||
a[1] = 0 ;
|
||||
memcpy((char *)a+1,(char *) &smc->mib.m[MAC0].fddiMACUpstreamNbr,6) ;
|
||||
memcpy((char *)a+1, (char *) &smc->mib.m[MAC0].fddiMACUpstreamNbr, ETH_ALEN);
|
||||
|
||||
CHECK_NPP() ;
|
||||
/* set memory address reg for writes */
|
||||
|
@@ -436,7 +436,7 @@ static int skfp_driver_init(struct net_device *dev)
|
||||
}
|
||||
read_address(smc, NULL);
|
||||
pr_debug("HW-Addr: %pMF\n", smc->hw.fddi_canon_addr.a);
|
||||
memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, 6);
|
||||
memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, ETH_ALEN);
|
||||
|
||||
smt_reset_defaults(smc, 0);
|
||||
|
||||
@@ -503,7 +503,7 @@ static int skfp_open(struct net_device *dev)
|
||||
* address.
|
||||
*/
|
||||
read_address(smc, NULL);
|
||||
memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, 6);
|
||||
memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, ETH_ALEN);
|
||||
|
||||
init_smt(smc, NULL);
|
||||
smt_online(smc, 1);
|
||||
@@ -1213,7 +1213,7 @@ static void CheckSourceAddress(unsigned char *frame, unsigned char *hw_addr)
|
||||
if ((unsigned short) frame[1 + 10] != 0)
|
||||
return;
|
||||
SRBit = frame[1 + 6] & 0x01;
|
||||
memcpy(&frame[1 + 6], hw_addr, 6);
|
||||
memcpy(&frame[1 + 6], hw_addr, ETH_ALEN);
|
||||
frame[8] |= SRBit;
|
||||
} // CheckSourceAddress
|
||||
|
||||
|
Reference in New Issue
Block a user