net: Move && and || to end of previous line

Not including net/atm/

Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 30 insertions, 25 deletions

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 7034ea4530e5..dd9414e44200 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -170,21 +170,23 @@ restart:
         for (s = sht[h1]; s; s = s->next) {
                 if (dst[RSVP_DST_LEN-1] == s->dst[RSVP_DST_LEN-1] &&
                     protocol == s->protocol &&
-                    !(s->dpi.mask & (*(u32*)(xprt+s->dpi.offset)^s->dpi.key))
+                    !(s->dpi.mask &
+                      (*(u32*)(xprt+s->dpi.offset)^s->dpi.key)) &&
 #if RSVP_DST_LEN == 4
-                    && dst[0] == s->dst[0]
-                    && dst[1] == s->dst[1]
-                    && dst[2] == s->dst[2]
+                    dst[0] == s->dst[0] &&
+                    dst[1] == s->dst[1] &&
+                    dst[2] == s->dst[2] &&
 #endif
-                    && tunnelid == s->tunnelid) {
+                    tunnelid == s->tunnelid) {
 
                         for (f = s->ht[h2]; f; f = f->next) {
                                 if (src[RSVP_DST_LEN-1] == f->src[RSVP_DST_LEN-1] &&
                                     !(f->spi.mask & (*(u32*)(xprt+f->spi.offset)^f->spi.key))
 #if RSVP_DST_LEN == 4
-                                    && src[0] == f->src[0]
-                                    && src[1] == f->src[1]
-                                    && src[2] == f->src[2]
+                                    &&
+                                    src[0] == f->src[0] &&
+                                    src[1] == f->src[1] &&
+                                    src[2] == f->src[2]
 #endif
                                     ) {
                                         *res = f->res;
@@ -493,13 +495,13 @@ static int rsvp_change(struct tcf_proto *tp, unsigned long base,
         for (sp = &data->ht[h1]; (s=*sp) != NULL; sp = &s->next) {
                 if (dst[RSVP_DST_LEN-1] == s->dst[RSVP_DST_LEN-1] &&
                     pinfo && pinfo->protocol == s->protocol &&
-                    memcmp(&pinfo->dpi, &s->dpi, sizeof(s->dpi)) == 0
+                    memcmp(&pinfo->dpi, &s->dpi, sizeof(s->dpi)) == 0 &&
 #if RSVP_DST_LEN == 4
-                    && dst[0] == s->dst[0]
-                    && dst[1] == s->dst[1]
-                    && dst[2] == s->dst[2]
+                    dst[0] == s->dst[0] &&
+                    dst[1] == s->dst[1] &&
+                    dst[2] == s->dst[2] &&
 #endif
-                    && pinfo->tunnelid == s->tunnelid) {
+                    pinfo->tunnelid == s->tunnelid) {
 
 insert:
                         /* OK, we found appropriate session */
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 2e38d1abd830..508cf5f3a6d5 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1344,8 +1344,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                 };
 
                 /* check for valid classid */
-                if (!classid || TC_H_MAJ(classid ^ sch->handle)
-                    || htb_find(classid, sch))
+                if (!classid || TC_H_MAJ(classid ^ sch->handle) ||
+                    htb_find(classid, sch))
                         goto failure;
 
                 /* check maximal depth */
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 2b88295cb7b7..d8b10e054627 100644
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -199,9 +199,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
          * do it now in software before we mangle it.
          */
         if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) {
-                if (!(skb = skb_unshare(skb, GFP_ATOMIC))
-                    || (skb->ip_summed == CHECKSUM_PARTIAL
-                        && skb_checksum_help(skb))) {
+                if (!(skb = skb_unshare(skb, GFP_ATOMIC)) ||
+                    (skb->ip_summed == CHECKSUM_PARTIAL &&
+                     skb_checksum_help(skb))) {
                         sch->qstats.drops++;
                         return NET_XMIT_DROP;
                 }
@@ -210,9 +210,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         }
 
         cb = netem_skb_cb(skb);
-        if (q->gap == 0                 /* not doing reordering */
-            || q->counter < q->gap      /* inside last reordering gap */
-            || q->reorder < get_crandom(&q->reorder_cor)) {
+        if (q->gap == 0 ||              /* not doing reordering */
+            q->counter < q->gap ||      /* inside last reordering gap */
+            q->reorder < get_crandom(&q->reorder_cor)) {
                 psched_time_t now;
                 psched_tdiff_t delay;
 
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 5a002c247231..db69637069c4 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -190,10 +190,13 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt)
 
         if (m->slaves) {
                 if (m->dev->flags & IFF_UP) {
-                        if ((m->dev->flags&IFF_POINTOPOINT && !(dev->flags&IFF_POINTOPOINT))
-                            || (m->dev->flags&IFF_BROADCAST && !(dev->flags&IFF_BROADCAST))
-                            || (m->dev->flags&IFF_MULTICAST && !(dev->flags&IFF_MULTICAST))
-                            || dev->mtu < m->dev->mtu)
+                        if ((m->dev->flags & IFF_POINTOPOINT &&
+                             !(dev->flags & IFF_POINTOPOINT)) ||
+                            (m->dev->flags & IFF_BROADCAST &&
+                             !(dev->flags & IFF_BROADCAST)) ||
+                            (m->dev->flags & IFF_MULTICAST &&
+                             !(dev->flags & IFF_MULTICAST)) ||
+                            dev->mtu < m->dev->mtu)
                                 return -EINVAL;
                 } else {
                         if (!(dev->flags&IFF_POINTOPOINT))