diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-07 17:01:55 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-12-07 17:01:55 +0100 |
| commit | 9d317732eeeed959b3d0fa2f7997f059d74ad75b (patch) | |
| tree | 55aa9bd858b6b77a496de7c2123b8c5608eadf90 /kernel/include/linux/netfilter/ip_set_timeout.h | |
| parent | 6e42ee58c2710f9cbe36655e3c3093af5b7c87c5 (diff) | |
Whitespace, checkpatch.pl cleanups.
Diffstat (limited to 'kernel/include/linux/netfilter/ip_set_timeout.h')
| -rw-r--r-- | kernel/include/linux/netfilter/ip_set_timeout.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/include/linux/netfilter/ip_set_timeout.h b/kernel/include/linux/netfilter/ip_set_timeout.h index b917480..519d84f 100644 --- a/kernel/include/linux/netfilter/ip_set_timeout.h +++ b/kernel/include/linux/netfilter/ip_set_timeout.h @@ -5,7 +5,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation. */ #ifdef __KERNEL__ @@ -38,14 +38,14 @@ ip_set_timeout_uget(struct nlattr *tb) /* Bitmap entry is unset */ #define IPSET_ELEM_UNSET 0 /* Bitmap entry is set with no timeout value */ -#define IPSET_ELEM_PERMANENT UINT_MAX/2 +#define IPSET_ELEM_PERMANENT (UINT_MAX/2) static inline bool ip_set_timeout_test(unsigned long timeout) { return timeout != IPSET_ELEM_UNSET - && (timeout == IPSET_ELEM_PERMANENT - || time_after(timeout, jiffies)); + && (timeout == IPSET_ELEM_PERMANENT + || time_after(timeout, jiffies)); } static inline bool @@ -60,15 +60,15 @@ static inline unsigned long ip_set_timeout_set(u32 timeout) { unsigned long t; - + if (!timeout) return IPSET_ELEM_PERMANENT; - + t = timeout * HZ + jiffies; if (t == IPSET_ELEM_UNSET || t == IPSET_ELEM_PERMANENT) /* Bingo! */ t++; - + return t; } @@ -103,15 +103,15 @@ static inline unsigned long ip_set_timeout_set(u32 timeout) { unsigned long t; - + if (!timeout) return IPSET_ELEM_PERMANENT; - + t = timeout * HZ + jiffies; if (t == IPSET_ELEM_PERMANENT) /* Bingo! :-) */ t++; - + return t; } |