Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d458cdf7 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b3d8e08

drivers/net/ethernet/8390/ax88796.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static int ax_init_dev(struct net_device *dev) 
			for (i = 0; i < 16; i++)

				SA_prom[i] = SA_prom[i+i];



		memcpy(dev->dev_addr, SA_prom, 6);

		memcpy(dev->dev_addr, SA_prom, ETH_ALEN);

	}



#ifdef CONFIG_AX88796_93CX6

drivers/net/ethernet/amd/atarilance.c

+2 −2
Original line number Diff line number Diff line
@@ -586,10 +586,10 @@ static unsigned long __init lance_probe1( struct net_device *dev, 
	switch( lp->cardtype ) {

	  case OLD_RIEBL:

		/* No ethernet address! (Set some default address) */

		memcpy( dev->dev_addr, OldRieblDefHwaddr, 6 );

		memcpy(dev->dev_addr, OldRieblDefHwaddr, ETH_ALEN);

		break;

	  case NEW_RIEBL:

		lp->memcpy_f( dev->dev_addr, RIEBL_HWADDR_ADDR, 6 );

		lp->memcpy_f(dev->dev_addr, RIEBL_HWADDR_ADDR, ETH_ALEN);

		break;

	  case PAM_CARD:

		i = IO->eeprom;

drivers/net/ethernet/amd/au1000_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int au1000_probe(struct platform_device *pdev) 
		aup->phy1_search_mac0 = 1;

	} else {

		if (is_valid_ether_addr(pd->mac)) {

			memcpy(dev->dev_addr, pd->mac, 6);

			memcpy(dev->dev_addr, pd->mac, ETH_ALEN);

		} else {

			/* Set a random MAC since no valid provided by platform_data. */

			eth_hw_addr_random(dev);

drivers/net/ethernet/amd/pcnet32.c

+1 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) 
				pr_cont(" warning: CSR address invalid,\n");

				pr_info("    using instead PROM address of");

			}

			memcpy(dev->dev_addr, promaddr, 6);

			memcpy(dev->dev_addr, promaddr, ETH_ALEN);

		}

	}

drivers/net/ethernet/apple/bmac.c

+2 −2
Original line number Diff line number Diff line
@@ -1220,8 +1220,8 @@ static void bmac_reset_and_enable(struct net_device *dev) 
	if (skb != NULL) {

		data = skb_put(skb, ETHERMINPACKET);

		memset(data, 0, ETHERMINPACKET);

		memcpy(data, dev->dev_addr, 6);

		memcpy(data+6, dev->dev_addr, 6);

		memcpy(data, dev->dev_addr, ETH_ALEN);

		memcpy(data + ETH_ALEN, dev->dev_addr, ETH_ALEN);

		bmac_transmit_packet(skb, dev);

	}

	spin_unlock_irqrestore(&bp->lock, flags);