d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle the case where both arge0 and arge1 MAC addresses are available via

Browse Source 
'eeprommac'.

The existing driver would just make arge units past 0 take the primary
MAC and increment it by the unit number, without correct address wrapping.
That has to be fixed at a later date.

Tested:

* Atheros DB120 reference obard
This commit is contained in:
Adrian Chadd 2014-03-16 02:41:47 +00:00
parent 83e19d0588
commit e93e413461
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/mips/atheros/if_arge.c
View File

@ -555,6 +555,7 @@ arge_attach(device_t dev)
long eeprom_mac_addr = 0;
int miicfg = 0;
int readascii = 0;
int local_mac = 0;
sc = device_get_softc(dev);
sc->arge_dev = dev;
@ -576,6 +577,7 @@ arge_attach(device_t dev)
*/
if (resource_long_value(device_get_name(dev), device_get_unit(dev),
"eeprommac", &eeprom_mac_addr) == 0) {
local_mac = 1;
int i;
const char *mac =
(const char *) MIPS_PHYS_TO_KSEG1(eeprom_mac_addr);
@ -729,7 +731,22 @@ arge_attach(device_t dev)
sc->arge_eaddr[4] = (rnd >> 16) & 0xff;
sc->arge_eaddr[5] = (rnd >> 8) & 0xff;
}
if (sc->arge_mac_unit != 0)
/*
* This is a little hairy and stupid.
*
* For some older boards, the arge1 mac isn't pulled from anywhere.
* It's just assumed the MAC is the base MAC + 1.
*
* For other boards, there's multiple MAC addresses stored in EEPROM.
*
* So, if we did read the eeprommac for this particular interface,
* let's use the address as given. Otherwise, just add the MAC unit
* counter to it.
*
* XXX TODO: we really should handle MAC byte wraparound!
*/
if (local_mac == 0 && sc->arge_mac_unit != 0)
sc->arge_eaddr[5] += sc->arge_mac_unit;
if (arge_dma_alloc(sc) != 0) {