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

Commit 7d7628f3 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

net/fec: cleanup types in fec_get_mac() 



My static checker complains that on some arches unsigned longs can be 8
characters which is larger than the buffer is only 6 chars.
Additionally, Ben Hutchings points out that the buffer actually holds
big endian data and the buffer we are reading from is CPU endian.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f91b29f5

drivers/net/ethernet/freescale/fec_main.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1099,10 +1099,10 @@ static void fec_get_mac(struct net_device *ndev) 
	 * 4) FEC mac registers set by bootloader

	 * 4) FEC mac registers set by bootloader

	 */

	 */

	if (!is_valid_ether_addr(iap)) {

	if (!is_valid_ether_addr(iap)) {

		*((unsigned long *) &tmpaddr[0]) =

		*((__be32 *) &tmpaddr[0]) =

			be32_to_cpu(readl(fep->hwp + FEC_ADDR_LOW));

			cpu_to_be32(readl(fep->hwp + FEC_ADDR_LOW));

		*((unsigned short *) &tmpaddr[4]) =

		*((__be16 *) &tmpaddr[4]) =

			be16_to_cpu(readl(fep->hwp + FEC_ADDR_HIGH) >> 16);

			cpu_to_be16(readl(fep->hwp + FEC_ADDR_HIGH) >> 16);

		iap = &tmpaddr[0];

		iap = &tmpaddr[0];

	}

	}