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>

1 files changed, 15 insertions, 13 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 */