diff options
| author | Lothar Waßmann <LW@KARO-electronics.de> | 2011-12-07 21:59:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-08 19:51:20 -0500 |
| commit | 589efdc7f7327bc8ddf597bdaf9de38fcea31744 (patch) | |
| tree | a6dc862570fe81b7e8b8870277185f30ece3dd90 /drivers/net/ethernet/freescale | |
| parent | 86f9f2c81c44223b1be129d0b15cf6edac2a5278 (diff) | |
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>
Diffstat (limited to 'drivers/net/ethernet/freescale')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index e2b5ce6efa2..11534b9c6b3 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 } |