diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-10-15 19:30:21 +0000 |
| commit | 19b0e56ba7d5a1c93075cac3d662486917a9ef35 (patch) | |
| tree | 030ca3ec5a74f7bf1a96580ad73d6e22956198b1 /target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch | |
| parent | 3b90e01db8852a89a0925e0b44faec6119d6c5c9 (diff) | |
| download | master-31e0f0ae-19b0e56ba7d5a1c93075cac3d662486917a9ef35.tar.gz master-31e0f0ae-19b0e56ba7d5a1c93075cac3d662486917a9ef35.tar.bz2 master-31e0f0ae-19b0e56ba7d5a1c93075cac3d662486917a9ef35.zip | |
refresh patches against 2.6.27 final
SVN-Revision: 12987
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch index c3a5becb54..26b04e51ca 100644 --- a/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch +++ b/target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.17.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -757,6 +757,27 @@ +@@ -757,6 +757,27 @@ config NETFILTER_XT_MATCH_STATE To compile it as a module, choose M here. If unsure, say N. @@ -30,7 +30,7 @@ depends on NETFILTER_XTABLES --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -78,6 +78,7 @@ +@@ -78,6 +78,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST) obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o @@ -2027,7 +2027,7 @@ +} --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -206,6 +206,14 @@ +@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n * too. */ nf_ct_remove_expectations(ct); @@ -2044,7 +2044,7 @@ BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode)); --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -162,7 +162,12 @@ +@@ -162,7 +162,12 @@ static int ct_seq_show(struct seq_file * return -ENOSPC; #endif @@ -2060,7 +2060,7 @@ return 0; --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h -@@ -118,6 +118,22 @@ +@@ -118,6 +118,22 @@ struct nf_conn u_int32_t secmark; #endif |