diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-23 14:04:42 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-11-23 14:04:42 +0000 |
| commit | d92c081a67b408dd36b9e8cd1bc973efb77b2bf3 (patch) | |
| tree | 066717f2274707966f663b5cfcb18e5e4910ab87 /target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch | |
| parent | 2f0ecbd629ac755177d265d05543a4fcae2962ce (diff) | |
linux/generic: refresh 2.6.37 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24111 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch b/target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch index 4d969e290..88b656b5e 100644 --- a/target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch +++ b/target/linux/generic/patches-2.6.37/100-netfilter_layer7_2.22.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -946,6 +946,27 @@ config NETFILTER_XT_MATCH_STATE +@@ -948,6 +948,27 @@ config NETFILTER_XT_MATCH_STATE To compile it as a module, choose M here. If unsure, say N. @@ -2059,7 +2059,7 @@ +} --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -202,6 +202,14 @@ destroy_conntrack(struct nf_conntrack *n +@@ -212,6 +212,14 @@ destroy_conntrack(struct nf_conntrack *n * too. */ nf_ct_remove_expectations(ct); @@ -2076,7 +2076,7 @@ BUG_ON(hlist_nulls_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnnode)); --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -178,6 +178,12 @@ static int ct_seq_show(struct seq_file * +@@ -200,6 +200,12 @@ static int ct_seq_show(struct seq_file * goto release; #endif |