summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-16 07:45:34 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-16 07:45:34 +0000
commit993735e76a12c958cc722267a900d9bb6d3191d4 (patch)
tree0e401a58b87374c0cdd7a1685e730a14e216df4e /target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
parent9d40adf19889147d7b68b997feab6e272f6eb9ef (diff)
[kernel] 2.6.30: update layer7 patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17284 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
index 9e499248c..f65e301fd 100644
--- a/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/101-netfilter_layer7_pktmatch.patch
@@ -60,8 +60,8 @@
return length;
}
-@@ -428,7 +430,7 @@ match(const struct sk_buff *skbin,
- const struct xt_layer7_info * info = matchinfo;
+@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
+
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
- unsigned char * app_data;
@@ -69,7 +69,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
-@@ -456,8 +458,8 @@ match(const struct sk_buff *skbin,
+@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@@ -80,7 +80,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
-@@ -490,6 +492,25 @@ match(const struct sk_buff *skbin,
+@@ -500,6 +502,25 @@ match(const struct sk_buff *skbin,
/* the return value gets checked later, when we're ready to use it */
comppattern = compile_and_cache(info->pattern, info->protocol);