drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
3454f83583
commit
8e95a2026f
@@ -174,10 +174,10 @@ void __devinit tulip_parse_eeprom(struct net_device *dev)
|
||||
}
|
||||
/* Do a fix-up based on the vendor half of the station address prefix. */
|
||||
for (i = 0; eeprom_fixups[i].name; i++) {
|
||||
if (dev->dev_addr[0] == eeprom_fixups[i].addr0
|
||||
&& dev->dev_addr[1] == eeprom_fixups[i].addr1
|
||||
&& dev->dev_addr[2] == eeprom_fixups[i].addr2) {
|
||||
if (dev->dev_addr[2] == 0xE8 && ee_data[0x1a] == 0x55)
|
||||
if (dev->dev_addr[0] == eeprom_fixups[i].addr0 &&
|
||||
dev->dev_addr[1] == eeprom_fixups[i].addr1 &&
|
||||
dev->dev_addr[2] == eeprom_fixups[i].addr2) {
|
||||
if (dev->dev_addr[2] == 0xE8 && ee_data[0x1a] == 0x55)
|
||||
i++; /* An Accton EN1207, not an outlaw Maxtech. */
|
||||
memcpy(ee_data + 26, eeprom_fixups[i].newtable,
|
||||
sizeof(eeprom_fixups[i].newtable));
|
||||
|
Reference in New Issue
Block a user