net/fec: cleanup types in fec_get_mac()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 29 Aug 2013 08:25:14 +0000 (11:25 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Aug 2013 21:54:27 +0000 (17:54 -0400)
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: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec_main.c

index 46019ba6e23a9161e950b62d2079757087a963de..0cd5e4b8b545d9a0cc8f6af01a7a0af7841ff4fd 100644 (file)
@@ -1099,10 +1099,10 @@ static void fec_get_mac(struct net_device *ndev)
         * 4) FEC mac registers set by bootloader
         */
        if (!is_valid_ether_addr(iap)) {
-               *((unsigned long *) &tmpaddr[0]) =
-                       be32_to_cpu(readl(fep->hwp + FEC_ADDR_LOW));
-               *((unsigned short *) &tmpaddr[4]) =
-                       be16_to_cpu(readl(fep->hwp + FEC_ADDR_HIGH) >> 16);
+               *((__be32 *) &tmpaddr[0]) =
+                       cpu_to_be32(readl(fep->hwp + FEC_ADDR_LOW));
+               *((__be16 *) &tmpaddr[4]) =
+                       cpu_to_be16(readl(fep->hwp + FEC_ADDR_HIGH) >> 16);
                iap = &tmpaddr[0];
        }