diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 10:20:14 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 10:20:14 +0100 |
commit | c2d28607e25b8884ffb893ab4bc6cbb3b1c5a386 (patch) | |
tree | 21ee322d19a38feb0df082566ca55baa198a95e2 /kernel/ip_set_hash_ip.c | |
parent | 7cd45445d55b14b7aca69a81b7815a98afc51784 (diff) |
Fix the placement style of boolean operators at continued lines
Fix "&&" and "||" continuation style (Patrick McHardy's review)
Diffstat (limited to 'kernel/ip_set_hash_ip.c')
-rw-r--r-- | kernel/ip_set_hash_ip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c index f07f14b..b374462 100644 --- a/kernel/ip_set_hash_ip.c +++ b/kernel/ip_set_hash_ip.c @@ -215,9 +215,9 @@ hash_ip_same_set(const struct ip_set *a, const struct ip_set *b) const struct ip_set_hash *y = b->data; /* Resizing changes htable_bits, so we ignore it */ - return x->maxelem == y->maxelem - && x->timeout == y->timeout - && x->netmask == y->netmask; + return x->maxelem == y->maxelem && + x->timeout == y->timeout && + x->netmask == y->netmask; } /* The type variant functions: IPv6 */ @@ -408,9 +408,9 @@ hash_ip_create(struct ip_set *set, struct nlattr *head, int len, u32 flags) if (tb[IPSET_ATTR_NETMASK]) { netmask = nla_get_u8(tb[IPSET_ATTR_NETMASK]); - if ((set->family == AF_INET && netmask > 32) - || (set->family == AF_INET6 && netmask > 128) - || netmask == 0) + if ((set->family == AF_INET && netmask > 32) || + (set->family == AF_INET6 && netmask > 128) || + netmask == 0) return -IPSET_ERR_INVALID_NETMASK; } |