summaryrefslogtreecommitdiffstats
path: root/kernel/ip_set_bitmap_ip.c
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 10:20:14 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 10:20:14 +0100
commitc2d28607e25b8884ffb893ab4bc6cbb3b1c5a386 (patch)
tree21ee322d19a38feb0df082566ca55baa198a95e2 /kernel/ip_set_bitmap_ip.c
parent7cd45445d55b14b7aca69a81b7815a98afc51784 (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_bitmap_ip.c')
-rw-r--r--kernel/ip_set_bitmap_ip.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c
index 1a8eed0..b653036 100644
--- a/kernel/ip_set_bitmap_ip.c
+++ b/kernel/ip_set_bitmap_ip.c
@@ -264,9 +264,9 @@ bitmap_ip_same_set(const struct ip_set *a, const struct ip_set *b)
const struct bitmap_ip *x = a->data;
const struct bitmap_ip *y = b->data;
- return x->first_ip == y->first_ip
- && x->last_ip == y->last_ip
- && x->netmask == y->netmask;
+ return x->first_ip == y->first_ip &&
+ x->last_ip == y->last_ip &&
+ x->netmask == y->netmask;
}
static const struct ip_set_type_variant bitmap_ip = {
@@ -511,10 +511,10 @@ bitmap_ip_timeout_same_set(const struct ip_set *a, const struct ip_set *b)
const struct bitmap_ip_timeout *x = a->data;
const struct bitmap_ip_timeout *y = b->data;
- return x->first_ip == y->first_ip
- && x->last_ip == y->last_ip
- && x->netmask == y->netmask
- && x->timeout == y->timeout;
+ return x->first_ip == y->first_ip &&
+ x->last_ip == y->last_ip &&
+ x->netmask == y->netmask &&
+ x->timeout == y->timeout;
}
static const struct ip_set_type_variant bitmap_ip_timeout = {
@@ -647,8 +647,8 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *head, int len,
mask = range_to_mask(first_ip, last_ip, &mask_bits);
- if ((!mask && (first_ip || last_ip != 0xFFFFFFFF))
- || netmask <= mask_bits)
+ if ((!mask && (first_ip || last_ip != 0xFFFFFFFF)) ||
+ netmask <= mask_bits)
return -IPSET_ERR_BITMAP_RANGE;
pr_debug("mask_bits %u, netmask %u", mask_bits, netmask);