netfilter: xtables: remove some goto

Combining two ifs, and goto is easily gone.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 82888bc6bc1af59b9dd679109af103b95d67f8ae..cfcb7af917247c44a81b40300bfc4168aac6d30f 100644 (file)
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -359,15 +359,12 @@ ipt_do_table(struct sk_buff *skb,
                IP_NF_ASSERT(e);
                IP_NF_ASSERT(back);
                if (!ip_packet_match(ip, indev, outdev,
-                   &e->ip, mtpar.fragoff)) {
- no_match:
+                   &e->ip, mtpar.fragoff) ||
+                   IPT_MATCH_ITERATE(e, do_match, skb, &mtpar) != 0) {
                        e = ipt_next_entry(e);
                        continue;
                }
 
-               if (IPT_MATCH_ITERATE(e, do_match, skb, &mtpar) != 0)
-                       goto no_match;
-
                ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
 
                t = ipt_get_target(e);

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index a6c2213f821ea18559553daab8b5a6bb0f0c966a..d01b8a39fbd8a3c800e26f014199fab762cd3b81 100644 (file)
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -386,15 +386,12 @@ ip6t_do_table(struct sk_buff *skb,
                IP_NF_ASSERT(e);
                IP_NF_ASSERT(back);
                if (!ip6_packet_match(skb, indev, outdev, &e->ipv6,
-                   &mtpar.thoff, &mtpar.fragoff, &hotdrop)) {
- no_match:
+                   &mtpar.thoff, &mtpar.fragoff, &hotdrop) ||
+                   IP6T_MATCH_ITERATE(e, do_match, skb, &mtpar) != 0) {
                        e = ip6t_next_entry(e);
                        continue;
                }
 
-               if (IP6T_MATCH_ITERATE(e, do_match, skb, &mtpar) != 0)
-                       goto no_match;
-
                ADD_COUNTER(e->counters,
                            ntohs(ipv6_hdr(skb)->payload_len) +
                            sizeof(struct ipv6hdr), 1);