[NETFILTER]: Remove redundant parentheses/braces

Removes redundant parentheses and braces (And add one pair in a
xt_tcpudp.c macro).

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 21 insertions, 34 deletions

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 2de7ae0180aa..5de13b44b1ca 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -122,9 +122,8 @@ __clusterip_config_find(__be32 clusterip)
         list_for_each(pos, &clusterip_configs) {
                 struct clusterip_config *c = list_entry(pos,
                                         struct clusterip_config, list);
-                if (c->clusterip == clusterip) {
+                if (c->clusterip == clusterip)
                         return c;
-                }
         }
 
         return NULL;
@@ -155,9 +154,8 @@ clusterip_config_init_nodelist(struct clusterip_config *c,
 {
         int n;
 
-        for (n = 0; n < i->num_local_nodes; n++) {
+        for (n = 0; n < i->num_local_nodes; n++)
                 set_bit(i->local_nodes[n] - 1, &c->local_nodes);
-        }
 }
 
 static struct clusterip_config *
@@ -255,10 +253,9 @@ clusterip_hashfn(const struct sk_buff *skb,
                 dport = ports[1];
                 break;
         default:
-                if (net_ratelimit()) {
+                if (net_ratelimit())
                         printk(KERN_NOTICE "CLUSTERIP: unknown protocol `%u'\n",
                                 iph->protocol);
-                }
                 sport = dport = 0;
         }
 
@@ -286,7 +283,7 @@ clusterip_hashfn(const struct sk_buff *skb,
         }
 
         /* node numbers are 1..n, not 0..n */
-        return ((hashval % config->num_total_nodes)+1);
+        return (hashval % config->num_total_nodes) + 1;
 }
 
 static inline int
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index 02367012fc74..a647c1db86dd 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -58,8 +58,8 @@ set_ect_tcp(struct sk_buff **pskb, const struct ipt_ECN_info *einfo)
 
         if ((!(einfo->operation & IPT_ECN_OP_SET_ECE) ||
              tcph->ece == einfo->proto.tcp.ece) &&
-            ((!(einfo->operation & IPT_ECN_OP_SET_CWR) ||
-             tcph->cwr == einfo->proto.tcp.cwr)))
+            (!(einfo->operation & IPT_ECN_OP_SET_CWR) ||
+             tcph->cwr == einfo->proto.tcp.cwr))
                 return true;
 
         if (!skb_make_writable(pskb, ip_hdrlen(*pskb) + sizeof(*tcph)))
diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index f53f2c4ca4a1..737830b68ade 100644
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -75,7 +75,7 @@ static bool ipt_ttl_checkentry(const char *tablename,
                         info->mode);
                 return false;
         }
-        if ((info->mode != IPT_TTL_SET) && (info->ttl == 0))
+        if (info->mode != IPT_TTL_SET && info->ttl == 0)
                 return false;
         return true;
 }
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 282eb00fc471..5b25ca688784 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -179,12 +179,10 @@ static void ipt_ulog_packet(unsigned int hooknum,
         unsigned int groupnum = ffs(loginfo->nl_group) - 1;
 
         /* calculate the size of the skb needed */
-        if ((loginfo->copy_range == 0) ||
-            (loginfo->copy_range > skb->len)) {
+        if (loginfo->copy_range == 0 || loginfo->copy_range > skb->len)
                 copy_len = skb->len;
-        } else {
+        else
                 copy_len = loginfo->copy_range;
-        }
 
         size = NLMSG_SPACE(sizeof(*pm) + copy_len);
 
@@ -257,9 +255,8 @@ static void ipt_ulog_packet(unsigned int hooknum,
                 BUG();
 
         /* check if we are building multi-part messages */
-        if (ub->qlen > 1) {
+        if (ub->qlen > 1)
                 ub->lastnlh->nlmsg_flags |= NLM_F_MULTI;
-        }
 
         ub->lastnlh = nlh;
 
diff --git a/net/ipv4/netfilter/ipt_iprange.c b/net/ipv4/netfilter/ipt_iprange.c
index b266d98aac8c..854281c62008 100644
--- a/net/ipv4/netfilter/ipt_iprange.c
+++ b/net/ipv4/netfilter/ipt_iprange.c
@@ -35,8 +35,8 @@ match(const struct sk_buff *skb,
         const struct iphdr *iph = ip_hdr(skb);
 
         if (info->flags & IPRANGE_SRC) {
-                if (((ntohl(iph->saddr) < ntohl(info->src.min_ip))
-                          || (ntohl(iph->saddr) > ntohl(info->src.max_ip)))
+                if ((ntohl(iph->saddr) < ntohl(info->src.min_ip)
+                          || ntohl(iph->saddr) > ntohl(info->src.max_ip))
                          ^ !!(info->flags & IPRANGE_SRC_INV)) {
                         DEBUGP("src IP %u.%u.%u.%u NOT in range %s"
                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
@@ -48,8 +48,8 @@ match(const struct sk_buff *skb,
                 }
         }
         if (info->flags & IPRANGE_DST) {
-                if (((ntohl(iph->daddr) < ntohl(info->dst.min_ip))
-                          || (ntohl(iph->daddr) > ntohl(info->dst.max_ip)))
+                if ((ntohl(iph->daddr) < ntohl(info->dst.min_ip)
+                          || ntohl(iph->daddr) > ntohl(info->dst.max_ip))
                          ^ !!(info->flags & IPRANGE_DST_INV)) {
                         DEBUGP("dst IP %u.%u.%u.%u NOT in range %s"
                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index d03e6a6eb767..68f7181e412d 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -163,10 +163,9 @@ static void recent_table_flush(struct recent_table *t)
         struct recent_entry *e, *next;
         unsigned int i;
 
-        for (i = 0; i < ip_list_hash_size; i++) {
+        for (i = 0; i < ip_list_hash_size; i++)
                 list_for_each_entry_safe(e, next, &t->iphash[i], list)
                         recent_entry_remove(t, e);
-        }
 }
 
 static bool
@@ -329,12 +328,10 @@ static void *recent_seq_start(struct seq_file *seq, loff_t *pos)
 
         spin_lock_bh(&recent_lock);
 
-        for (st->bucket = 0; st->bucket < ip_list_hash_size; st->bucket++) {
-                list_for_each_entry(e, &t->iphash[st->bucket], list) {
+        for (st->bucket = 0; st->bucket < ip_list_hash_size; st->bucket++)
+                list_for_each_entry(e, &t->iphash[st->bucket], list)
                         if (p-- == 0)
                                 return e;
-                }
-        }
         return NULL;
 }
 
diff --git a/net/ipv4/netfilter/ipt_ttl.c b/net/ipv4/netfilter/ipt_ttl.c
index 82fe4ea8ab79..59a644db4d74 100644
--- a/net/ipv4/netfilter/ipt_ttl.c
+++ b/net/ipv4/netfilter/ipt_ttl.c
@@ -28,17 +28,13 @@ static bool match(const struct sk_buff *skb,
 
         switch (info->mode) {
                 case IPT_TTL_EQ:
-                        return (ttl == info->ttl);
-                        break;
+                        return ttl == info->ttl;
                 case IPT_TTL_NE:
-                        return (!(ttl == info->ttl));
-                        break;
+                        return ttl != info->ttl;
                 case IPT_TTL_LT:
-                        return (ttl < info->ttl);
-                        break;
+                        return ttl < info->ttl;
                 case IPT_TTL_GT:
-                        return (ttl > info->ttl);
-                        break;
+                        return ttl > info->ttl;
                 default:
                         printk(KERN_WARNING "ipt_ttl: unknown mode %d\n",
                                 info->mode);