fix a compile error in the netfilter match speedup patch for 2.6.30

[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 110-netfilter_match_speedup.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
index 22f0a4341c4252464c6bfea07bbb33a48df0696f..950a432959e3081d0d533b66464706fe72e4c264 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch
@@ -20,7 +20,7 @@
        if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
                  IPT_INV_SRCIP)
            || FWINV((ip->daddr&ipinfo->dmsk.s_addr) != ipinfo->dst.s_addr,
-@@ -137,13 +140,32 @@ ip_packet_match(const struct iphdr *ip,
+@@ -137,13 +140,35 @@ ip_packet_match(const struct iphdr *ip,
                return false;
        }
  
@@ -45,6 +45,9 @@
 +              IPT_INV_VIA_OUT))
 +              goto has_match_rules;
 +
++      if (FWINV(ip->proto, IPT_INV_PROTO))
++              goto has_match_rules;
++
 +      if (FWINV(ip->flags&IPT_F_FRAG, IPT_INV_FRAG))
 +              goto has_match_rules;
 +
@@ -55,7 +58,7 @@
                duprintf("Unknown flag bits set: %08X\n",
                         ip->flags & ~IPT_F_MASK);
                return false;
-@@ -153,6 +175,8 @@ ip_checkentry(const struct ipt_ip *ip)
+@@ -153,6 +178,8 @@ ip_checkentry(const struct ipt_ip *ip)
                         ip->invflags & ~IPT_INV_MASK);
                return false;
        }
@@ -64,7 +67,7 @@
        return true;
  }
  
-@@ -200,7 +224,6 @@ unconditional(const struct ipt_ip *ip)
+@@ -200,7 +227,6 @@ unconditional(const struct ipt_ip *ip)
                        return 0;
  
        return 1;
@@ -72,3 +75,47 @@
  }
  
  #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
+@@ -318,8 +344,28 @@ ipt_do_table(struct sk_buff *skb,
+       struct xt_match_param mtpar;
+       struct xt_target_param tgpar;
+ 
+-      /* Initialization */
+       ip = ip_hdr(skb);
++
++      IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++      xt_info_rdlock_bh();
++      private = table->private;
++      table_base = private->entries[smp_processor_id()];
++      e = get_entry(table_base, private->hook_entry[hook]);
++
++      if (e->target_offset <= sizeof(struct ipt_entry) &&
++              (e->ip.flags & IPT_F_NO_DEF_MATCH)) {
++                      struct ipt_entry_target *t = ipt_get_target(e);
++                      if (!t->u.kernel.target->target) {
++                              int v = ((struct ipt_standard_target *)t)->verdict;
++                              if ((v < 0) && (v != IPT_RETURN)) {
++                                      ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
++                                      xt_info_rdunlock_bh();
++                                      return (unsigned)(-v) - 1;
++                              }
++                      }
++      }
++
++      /* Initialization */
+       datalen = skb->len - ip->ihl * 4;
+       indev = in ? in->name : nulldevname;
+       outdev = out ? out->name : nulldevname;
+@@ -337,13 +383,6 @@ ipt_do_table(struct sk_buff *skb,
+       mtpar.family  = tgpar.family = NFPROTO_IPV4;
+       tgpar.hooknum = hook;
+ 
+-      IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+-      xt_info_rdlock_bh();
+-      private = table->private;
+-      table_base = private->entries[smp_processor_id()];
+-
+-      e = get_entry(table_base, private->hook_entry[hook]);
+-
+       /* For return from builtin chain */
+       back = get_entry(table_base, private->underflow[hook]);
+