FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-05 17:01:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net/fec: don't munge MAC address from platform data

Browse Source 
When the MAC address is supplied via platform_data it should be OK as
it is and should not be modified in case of a dual FEC setup.
Also copying the MAC from platform_data to the single 'macaddr'
variable will overwrite the MAC for the first interface in case of a
dual FEC setup.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lothar Waßmann 2011-12-07 21:59:29 +00:00 committed by David S. Miller
parent 86f9f2c81c
commit 589efdc7f7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/freescale/fec.c
View File

@ -818,7 +818,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
iap = (unsigned char *)FEC_FLASHMAC; iap = (unsigned char *)FEC_FLASHMAC;
#else #else
if (pdata) if (pdata)
memcpy(iap, pdata->mac, ETH_ALEN); iap = (unsigned char *)&pdata->mac;
#endif #endif
} }