diff options
| author | Joe Perches <joe@perches.com> | 2009-11-24 14:52:52 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 14:52:52 -0800 |
| commit | 35700212b45ea9f98fa682cfc1bc1a67c9ccc34b (patch) | |
| tree | 5412758979e296f5fa0a89e2a575b3a43034678f /net/ipv6/ip6_flowlabel.c | |
| parent | c459302db655c1a7fd05fd4266b18990854e8386 (diff) | |
| download | talos-obmc-linux-35700212b45ea9f98fa682cfc1bc1a67c9ccc34b.tar.gz talos-obmc-linux-35700212b45ea9f98fa682cfc1bc1a67c9ccc34b.zip | |
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>
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
| -rw-r--r-- | net/ipv6/ip6_flowlabel.c | 8 |
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; |
