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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 7712578bdc66..593a67e8d3f6 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -377,8 +377,8 @@ fl_create(struct net *net, struct in6_flowlabel_req *freq, char __user *optval,
                 goto done;
         fl->share = freq->flr_share;
         addr_type = ipv6_addr_type(&freq->flr_dst);
-        if ((addr_type&IPV6_ADDR_MAPPED)
-            || addr_type == IPV6_ADDR_ANY) {
+        if ((addr_type & IPV6_ADDR_MAPPED) ||
+            addr_type == IPV6_ADDR_ANY) {
                 err = -EINVAL;
                 goto done;
         }
@@ -421,8 +421,8 @@ static int mem_check(struct sock *sk)
 
         if (room <= 0 ||
             ((count >= FL_MAX_PER_SOCK ||
-             (count > 0 && room < FL_MAX_SIZE/2) || room < FL_MAX_SIZE/4)
-             && !capable(CAP_NET_ADMIN)))
+              (count > 0 && room < FL_MAX_SIZE/2) || room < FL_MAX_SIZE/4) &&
+             !capable(CAP_NET_ADMIN)))
                 return -ENOBUFS;
 
         return 0;