diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/tulip/eeprom.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/tulip/eeprom.c')
| -rw-r--r-- | drivers/net/tulip/eeprom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c index 391acd32a6a5..889f57aae89b 100644 --- a/drivers/net/tulip/eeprom.c +++ b/drivers/net/tulip/eeprom.c | |||
| @@ -174,10 +174,10 @@ void __devinit tulip_parse_eeprom(struct net_device *dev) | |||
| 174 | } | 174 | } |
| 175 | /* Do a fix-up based on the vendor half of the station address prefix. */ | 175 | /* Do a fix-up based on the vendor half of the station address prefix. */ |
| 176 | for (i = 0; eeprom_fixups[i].name; i++) { | 176 | for (i = 0; eeprom_fixups[i].name; i++) { |
| 177 | if (dev->dev_addr[0] == eeprom_fixups[i].addr0 | 177 | if (dev->dev_addr[0] == eeprom_fixups[i].addr0 && |
| 178 | && dev->dev_addr[1] == eeprom_fixups[i].addr1 | 178 | dev->dev_addr[1] == eeprom_fixups[i].addr1 && |
| 179 | && dev->dev_addr[2] == eeprom_fixups[i].addr2) { | 179 | dev->dev_addr[2] == eeprom_fixups[i].addr2) { |
| 180 | if (dev->dev_addr[2] == 0xE8 && ee_data[0x1a] == 0x55) | 180 | if (dev->dev_addr[2] == 0xE8 && ee_data[0x1a] == 0x55) |
| 181 | i++; /* An Accton EN1207, not an outlaw Maxtech. */ | 181 | i++; /* An Accton EN1207, not an outlaw Maxtech. */ |
| 182 | memcpy(ee_data + 26, eeprom_fixups[i].newtable, | 182 | memcpy(ee_data + 26, eeprom_fixups[i].newtable, |
| 183 | sizeof(eeprom_fixups[i].newtable)); | 183 | sizeof(eeprom_fixups[i].newtable)); |