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/media.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/media.c')
-rw-r--r-- | drivers/net/tulip/media.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/media.c b/drivers/net/tulip/media.c index daddfa51853e..d8fda83705bf 100644 --- a/drivers/net/tulip/media.c +++ b/drivers/net/tulip/media.c | |||
@@ -468,8 +468,8 @@ void __devinit tulip_find_mii (struct net_device *dev, int board_idx) | |||
468 | int phy = phyn & 0x1f; | 468 | int phy = phyn & 0x1f; |
469 | int mii_status = tulip_mdio_read (dev, phy, MII_BMSR); | 469 | int mii_status = tulip_mdio_read (dev, phy, MII_BMSR); |
470 | if ((mii_status & 0x8301) == 0x8001 || | 470 | if ((mii_status & 0x8301) == 0x8001 || |
471 | ((mii_status & BMSR_100BASE4) == 0 | 471 | ((mii_status & BMSR_100BASE4) == 0 && |
472 | && (mii_status & 0x7800) != 0)) { | 472 | (mii_status & 0x7800) != 0)) { |
473 | /* preserve Becker logic, gain indentation level */ | 473 | /* preserve Becker logic, gain indentation level */ |
474 | } else { | 474 | } else { |
475 | continue; | 475 | continue; |