From: Lothar Waßmann Date: Wed, 7 Dec 2011 21:59:29 +0000 (+0000) Subject: net/fec: don't munge MAC address from platform data X-Git-Tag: v3.3-rc1~182^2~297 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=589efdc7f7327bc8ddf597bdaf9de38fcea31744;p=platform%2Fkernel%2Flinux-stable.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 Acked-by: Shawn Guo Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index e2b5ce6..11534b9 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 }