netfilter: xtables: remove another level of indent
Jan Engelhardt [Wed, 15 Apr 2009 19:35:33 +0000 (21:35 +0200)]
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

net/ipv4/netfilter/arp_tables.c
net/ipv4/netfilter/ip_tables.c
net/ipv6/netfilter/ip6_tables.c

index ecba246..7505dff 100644 (file)
@@ -313,23 +313,24 @@ unsigned int arpt_do_table(struct sk_buff *skb,
                        }
 
                        e = get_entry(table_base, v);
-               } else {
-                       /* Targets which reenter must return
-                        * abs. verdicts
-                        */
-                       tgpar.target   = t->u.kernel.target;
-                       tgpar.targinfo = t->data;
-                       verdict = t->u.kernel.target->target(skb, &tgpar);
-
-                       /* Target might have changed stuff. */
-                       arp = arp_hdr(skb);
-
-                       if (verdict == ARPT_CONTINUE)
-                               e = arpt_next_entry(e);
-                       else
-                               /* Verdict */
-                               break;
+                       continue;
                }
+
+               /* Targets which reenter must return
+                * abs. verdicts
+                */
+               tgpar.target   = t->u.kernel.target;
+               tgpar.targinfo = t->data;
+               verdict = t->u.kernel.target->target(skb, &tgpar);
+
+               /* Target might have changed stuff. */
+               arp = arp_hdr(skb);
+
+               if (verdict == ARPT_CONTINUE)
+                       e = arpt_next_entry(e);
+               else
+                       /* Verdict */
+                       break;
        } while (!hotdrop);
        xt_info_rdunlock_bh();
 
index cfcb7af..d91ecd4 100644 (file)
@@ -402,37 +402,35 @@ ipt_do_table(struct sk_buff *skb,
                        }
 
                        e = get_entry(table_base, v);
-               } else {
-                       /* Targets which reenter must return
-                          abs. verdicts */
-                       tgpar.target   = t->u.kernel.target;
-                       tgpar.targinfo = t->data;
+                       continue;
+               }
+
+               /* Targets which reenter must return
+                  abs. verdicts */
+               tgpar.target   = t->u.kernel.target;
+               tgpar.targinfo = t->data;
 #ifdef CONFIG_NETFILTER_DEBUG
-                       ((struct ipt_entry *)table_base)->comefrom
-                               = 0xeeeeeeec;
+               ((struct ipt_entry *)table_base)->comefrom = 0xeeeeeeec;
 #endif
-                       verdict = t->u.kernel.target->target(skb, &tgpar);
+               verdict = t->u.kernel.target->target(skb, &tgpar);
 #ifdef CONFIG_NETFILTER_DEBUG
-                       if (((struct ipt_entry *)table_base)->comefrom
-                           != 0xeeeeeeec
-                           && verdict == IPT_CONTINUE) {
-                               printk("Target %s reentered!\n",
-                                      t->u.kernel.target->name);
-                               verdict = NF_DROP;
-                       }
-                       ((struct ipt_entry *)table_base)->comefrom
-                               = 0x57acc001;
-#endif
-                       /* Target might have changed stuff. */
-                       ip = ip_hdr(skb);
-                       datalen = skb->len - ip->ihl * 4;
-
-                       if (verdict == IPT_CONTINUE)
-                               e = ipt_next_entry(e);
-                       else
-                               /* Verdict */
-                               break;
+               if (((struct ipt_entry *)table_base)->comefrom != 0xeeeeeeec &&
+                   verdict == IPT_CONTINUE) {
+                       printk("Target %s reentered!\n",
+                              t->u.kernel.target->name);
+                       verdict = NF_DROP;
                }
+               ((struct ipt_entry *)table_base)->comefrom = 0x57acc001;
+#endif
+               /* Target might have changed stuff. */
+               ip = ip_hdr(skb);
+               datalen = skb->len - ip->ihl * 4;
+
+               if (verdict == IPT_CONTINUE)
+                       e = ipt_next_entry(e);
+               else
+                       /* Verdict */
+                       break;
        } while (!hotdrop);
        xt_info_rdunlock_bh();
 
index d01b8a3..5a178be 100644 (file)
@@ -431,35 +431,33 @@ ip6t_do_table(struct sk_buff *skb,
                        }
 
                        e = get_entry(table_base, v);
-               } else {
-                       /* Targets which reenter must return
-                          abs. verdicts */
-                       tgpar.target   = t->u.kernel.target;
-                       tgpar.targinfo = t->data;
+                       continue;
+               }
+
+               /* Targets which reenter must return
+                  abs. verdicts */
+               tgpar.target   = t->u.kernel.target;
+               tgpar.targinfo = t->data;
 
 #ifdef CONFIG_NETFILTER_DEBUG
-                       ((struct ip6t_entry *)table_base)->comefrom
-                               = 0xeeeeeeec;
+               ((struct ip6t_entry *)table_base)->comefrom = 0xeeeeeeec;
 #endif
-                       verdict = t->u.kernel.target->target(skb, &tgpar);
+               verdict = t->u.kernel.target->target(skb, &tgpar);
 
 #ifdef CONFIG_NETFILTER_DEBUG
-                       if (((struct ip6t_entry *)table_base)->comefrom
-                           != 0xeeeeeeec
-                           && verdict == IP6T_CONTINUE) {
-                               printk("Target %s reentered!\n",
-                                      t->u.kernel.target->name);
-                               verdict = NF_DROP;
-                       }
-                       ((struct ip6t_entry *)table_base)->comefrom
-                               = 0x57acc001;
-#endif
-                       if (verdict == IP6T_CONTINUE)
-                               e = ip6t_next_entry(e);
-                       else
-                               /* Verdict */
-                               break;
+               if (((struct ip6t_entry *)table_base)->comefrom != 0xeeeeeeec &&
+                   verdict == IP6T_CONTINUE) {
+                       printk("Target %s reentered!\n",
+                              t->u.kernel.target->name);
+                       verdict = NF_DROP;
                }
+               ((struct ip6t_entry *)table_base)->comefrom = 0x57acc001;
+#endif
+               if (verdict == IP6T_CONTINUE)
+                       e = ip6t_next_entry(e);
+               else
+                       /* Verdict */
+                       break;
        } while (!hotdrop);
 
 #ifdef CONFIG_NETFILTER_DEBUG