summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-09-10 20:51:07 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2012-09-10 20:51:07 +0200
commitb71dea6a0c7761117b192ffa60d6e06833db06c7 (patch)
tree080db9631547879edf545911f30520414669f587
parent9db0e81848c2cb586fa06c98d80a0b3de607fcf8 (diff)
Coding style fix, backport from kernel
-rw-r--r--kernel/net/netfilter/xt_set.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/netfilter/xt_set.c b/kernel/net/netfilter/xt_set.c
index b172cbc..c6f7db7 100644
--- a/kernel/net/netfilter/xt_set.c
+++ b/kernel/net/netfilter/xt_set.c
@@ -311,8 +311,8 @@ set_target_v2(struct sk_buff *skb, const struct xt_action_param *par)
info->del_set.flags, 0, UINT_MAX);
/* Normalize to fit into jiffies */
- if (add_opt.timeout != IPSET_NO_TIMEOUT
- && add_opt.timeout > UINT_MAX/MSEC_PER_SEC)
+ if (add_opt.timeout != IPSET_NO_TIMEOUT &&
+ add_opt.timeout > UINT_MAX/MSEC_PER_SEC)
add_opt.timeout = UINT_MAX/MSEC_PER_SEC;
if (info->add_set.index != IPSET_INVALID_ID)
ip_set_add(info->add_set.index, skb, par, &add_opt);