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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 406f06424251..9b587c344194 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -438,8 +438,8 @@ bmac_init_phy(struct net_device *dev)
 
                 ctrl = bmac_mif_read(dev, 0);
                 capable = ((bmac_mif_read(dev, 1) & 0xf800) >> 6) | 1;
-                if (bmac_mif_read(dev, 4) != capable
-                    || (ctrl & 0x1000) == 0) {
+                if (bmac_mif_read(dev, 4) != capable ||
+                    (ctrl & 0x1000) == 0) {
                         bmac_mif_write(dev, 4, capable);
                         bmac_mif_write(dev, 0, 0x1200);
                 } else