From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Mon, 10 Sep 2012 18:51:07 +0000 (+0200)
Subject: Coding style fix, backport from kernel
X-Git-Tag: v6.14~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b71dea6a0c7761117b192ffa60d6e06833db06c7;p=ipset

Coding style fix, backport from kernel
---

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);