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, 6 insertions, 6 deletions

diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index e173515790c0..dac4e595589e 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1629,8 +1629,8 @@ static int netdev_rx(struct net_device *dev)
                 if (debug)
                         printk(KERN_DEBUG "  netdev_rx() status was %8.8x.\n", rx_status);
 
-                if ((!((rx_status & RXFSD) && (rx_status & RXLSD)))
-                    || (rx_status & ErrorSummary)) {
+                if ((!((rx_status & RXFSD) && (rx_status & RXLSD))) ||
+                    (rx_status & ErrorSummary)) {
                         if (rx_status & ErrorSummary) { /* there was a fatal error */
                                 if (debug)
                                         printk(KERN_DEBUG
@@ -1655,8 +1655,8 @@ static int netdev_rx(struct net_device *dev)
                                         cur = np->cur_rx;
                                         while (desno <= np->really_rx_count) {
                                                 ++desno;
-                                                if ((!(cur->status & RXOWN))
-                                                    && (cur->status & RXLSD))
+                                                if ((!(cur->status & RXOWN)) &&
+                                                    (cur->status & RXLSD))
                                                         break;
                                                 /* goto next rx descriptor */
                                                 cur = cur->next_desc_logical;
@@ -1786,8 +1786,8 @@ static void __set_rx_mode(struct net_device *dev)
         if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = CR_W_PROM | CR_W_AB | CR_W_AM;
-        } else if ((dev->mc_count > multicast_filter_limit)
-                   || (dev->flags & IFF_ALLMULTI)) {
+        } else if ((dev->mc_count > multicast_filter_limit) ||
+                   (dev->flags & IFF_ALLMULTI)) {
                 /* Too many to match, or accept all multicasts. */
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = CR_W_AB | CR_W_AM;