diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-29 04:25:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-30 17:54:27 -0400 |
commit | 7d7628f3719e85e41d3948759ef969707036033d (patch) | |
tree | 1cf9e611107f14eb0133e22069e6c6566c8f9737 /drivers/net/ethernet/freescale | |
parent | f91b29f5b8709a3968ce0e155cfeab2bc6f733dd (diff) |
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: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale')
-rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 46019ba6e23a..0cd5e4b8b545 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c | |||
@@ -1099,10 +1099,10 @@ static void fec_get_mac(struct net_device *ndev) | |||
1099 | * 4) FEC mac registers set by bootloader | 1099 | * 4) FEC mac registers set by bootloader |
1100 | */ | 1100 | */ |
1101 | if (!is_valid_ether_addr(iap)) { | 1101 | if (!is_valid_ether_addr(iap)) { |
1102 | *((unsigned long *) &tmpaddr[0]) = | 1102 | *((__be32 *) &tmpaddr[0]) = |
1103 | be32_to_cpu(readl(fep->hwp + FEC_ADDR_LOW)); | 1103 | cpu_to_be32(readl(fep->hwp + FEC_ADDR_LOW)); |
1104 | *((unsigned short *) &tmpaddr[4]) = | 1104 | *((__be16 *) &tmpaddr[4]) = |
1105 | be16_to_cpu(readl(fep->hwp + FEC_ADDR_HIGH) >> 16); | 1105 | cpu_to_be16(readl(fep->hwp + FEC_ADDR_HIGH) >> 16); |
1106 | iap = &tmpaddr[0]; | 1106 | iap = &tmpaddr[0]; |
1107 | } | 1107 | } |
1108 | 1108 | ||