diff options
Diffstat (limited to 'drivers/net/fec.c')
| -rwxr-xr-x | drivers/net/fec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 8a2c60f29898..bcd02e5cfaf0 100755 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -691,8 +691,12 @@ static void __inline__ fec_get_mac(struct net_device *ndev) memcpy(ndev->dev_addr, iap, ETH_ALEN); -#if !defined(CONFIG_COLIBRI_VF) /* Adjust MAC if using macaddr */ +#if CONFIG_COLIBRI_VF + /* Add 0x100000 to the first MAC address to get the second */ + if (iap == macaddr) + ndev->dev_addr[3] = macaddr[3] + (fep->pdev->id * 0x10); +#else if (iap == macaddr) ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->pdev->id; #endif /* !CONFIG_COLIBRI_VF */ |