From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Wed, 7 Dec 2011 21:59:29 +0000 (+0000)
Subject: net/fec: don't munge MAC address from platform data
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=589efdc7f7327bc8ddf597bdaf9de38fcea31744;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

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>
---

diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index e2b5ce6efa20..11534b9c6b39 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -818,7 +818,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev)
 			iap = (unsigned char *)FEC_FLASHMAC;
 #else
 		if (pdata)
-			memcpy(iap, pdata->mac, ETH_ALEN);
+			iap = (unsigned char *)&pdata->mac;
 #endif
 	}