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/include | |
| 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/include')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_ahash.h | 4 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_timeout.h | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h index 2975041..621e119 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h @@ -807,8 +807,8 @@ type_pf_tadd(struct ip_set *set, void *value, u32 timeout) ret = -IPSET_ERR_EXIST; goto out; } - } else if (j == AHASH_MAX_SIZE + 1 - && type_pf_data_expired(data)) + } else if (j == AHASH_MAX_SIZE + 1 && + type_pf_data_expired(data)) j = i; } if (j != AHASH_MAX_SIZE + 1) { diff --git a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h index 7383716..9f30c5f 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_timeout.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_timeout.h @@ -43,17 +43,17 @@ ip_set_timeout_uget(struct nlattr *tb) static inline bool ip_set_timeout_test(unsigned long timeout) { - return timeout != IPSET_ELEM_UNSET - && (timeout == IPSET_ELEM_PERMANENT - || time_after(timeout, jiffies)); + return timeout != IPSET_ELEM_UNSET && + (timeout == IPSET_ELEM_PERMANENT || + time_after(timeout, jiffies)); } static inline bool ip_set_timeout_expired(unsigned long timeout) { - return timeout != IPSET_ELEM_UNSET - && timeout != IPSET_ELEM_PERMANENT - && time_before(timeout, jiffies); + return timeout != IPSET_ELEM_UNSET && + timeout != IPSET_ELEM_PERMANENT && + time_before(timeout, jiffies); } static inline unsigned long @@ -88,15 +88,15 @@ ip_set_timeout_get(unsigned long timeout) static inline bool ip_set_timeout_test(unsigned long timeout) { - return timeout == IPSET_ELEM_PERMANENT - || time_after(timeout, jiffies); + return timeout == IPSET_ELEM_PERMANENT || + time_after(timeout, jiffies); } static inline bool ip_set_timeout_expired(unsigned long timeout) { - return timeout != IPSET_ELEM_PERMANENT - && time_before(timeout, jiffies); + return timeout != IPSET_ELEM_PERMANENT && + time_before(timeout, jiffies); } static inline unsigned long |