diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/tulip/eeprom.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) |
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>
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)); |