Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35700212 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c459302d

net/ipv6/ip6_flowlabel.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -377,8 +377,8 @@ fl_create(struct net *net, struct in6_flowlabel_req *freq, char __user *optval, 
		goto done;

		goto done;

	fl->share = freq->flr_share;

	fl->share = freq->flr_share;

	addr_type = ipv6_addr_type(&freq->flr_dst);

	addr_type = ipv6_addr_type(&freq->flr_dst);

	if ((addr_type&IPV6_ADDR_MAPPED)

	if ((addr_type & IPV6_ADDR_MAPPED) ||

	    || addr_type == IPV6_ADDR_ANY) {

	    addr_type == IPV6_ADDR_ANY) {

		err = -EINVAL;

		err = -EINVAL;

		goto done;

		goto done;

	}

	}
@@ -421,8 +421,8 @@ static int mem_check(struct sock *sk) 




	if (room <= 0 ||

	if (room <= 0 ||

	    ((count >= FL_MAX_PER_SOCK ||

	    ((count >= FL_MAX_PER_SOCK ||

	     (count > 0 && room < FL_MAX_SIZE/2) || room < FL_MAX_SIZE/4)

	      (count > 0 && room < FL_MAX_SIZE/2) || room < FL_MAX_SIZE/4) &&

	     && !capable(CAP_NET_ADMIN)))

	     !capable(CAP_NET_ADMIN)))

		return -ENOBUFS;

		return -ENOBUFS;





	return 0;

	return 0;