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

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 74636c5c41f0..c708ecc3cb2e 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -428,8 +428,8 @@ again:
         /* Out of packets? */
         if (received < budget) {
                 napi_complete(napi);
-                if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq))
-                    && napi_schedule_prep(napi)) {
+                if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq)) &&
+                    napi_schedule_prep(napi)) {
                         vi->rvq->vq_ops->disable_cb(vi->rvq);
                         __napi_schedule(napi);
                         goto again;
@@ -890,9 +890,9 @@ static int virtnet_probe(struct virtio_device *vdev)
         INIT_DELAYED_WORK(&vi->refill, refill_work);
 
         /* If we can receive ANY GSO packets, we must allocate large ones. */
-        if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4)
-            || virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6)
-            || virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN))
+        if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
+            virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6) ||
+            virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN))
                 vi->big_packets = true;
 
         if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))