diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-04 10:37:48 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-04 10:37:48 +0000 |
| commit | 9a9ece5346ef463108cea608f1dd48df162c1b52 (patch) | |
| tree | cba16ac873655552a79a8f3e6458216e6a5c1c6a /target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch | |
| parent | 7f7a85d6419eb4de45cfae5577a5acf38215c2f1 (diff) | |
refresh generic 2.6.28 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15578 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch index 59c3f8b47..57f1b0274 100644 --- a/target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch +++ b/target/linux/generic-2.6/patches-2.6.28/100-netfilter_layer7_2.21.patch @@ -16,7 +16,7 @@ +#endif /* _XT_LAYER7_H */ --- 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 @@ -41,7 +41,7 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -795,6 +795,27 @@ +@@ -795,6 +795,27 @@ config NETFILTER_XT_MATCH_STATE To compile it as a module, choose M here. If unsure, say N. @@ -71,7 +71,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -84,6 +84,7 @@ +@@ -84,6 +84,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o @@ -81,7 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -201,6 +201,14 @@ +@@ -201,6 +201,14 @@ destroy_conntrack(struct nf_conntrack *n * too. */ nf_ct_remove_expectations(ct); @@ -98,7 +98,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 -@@ -165,6 +165,12 @@ +@@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file * return -ENOSPC; #endif |