diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:49:28 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:49:28 +0000 |
| commit | 2d6c35b908dc14e85ab070da0c61253e4ffa67db (patch) | |
| tree | e877487b5efa53027cc6e8017713fa14f02c6b29 /target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch | |
| parent | 6aa05063a52278eab1a99172defd90e186c10c07 (diff) | |
| download | upstream-2d6c35b908dc14e85ab070da0c61253e4ffa67db.tar.gz upstream-2d6c35b908dc14e85ab070da0c61253e4ffa67db.tar.bz2 upstream-2d6c35b908dc14e85ab070da0c61253e4ffa67db.zip | |
[kernel] refresh generic 2.6.26 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11336 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch index 917adc51a0..451dfe9c1b 100644 --- a/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch +++ b/target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.17.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -735,6 +735,27 @@ +@@ -749,6 +749,27 @@ 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 -@@ -77,6 +77,7 @@ +@@ -78,6 +78,7 @@ 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 -@@ -210,6 +210,14 @@ +@@ -207,6 +207,14 @@ * 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 -@@ -181,7 +181,12 @@ +@@ -174,7 +174,12 @@ return -ENOSPC; #endif |