diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-24 13:05:22 +0000 |
commit | eb0c0200624c487af549aca9eddb722413dbc1cd (patch) | |
tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch | |
parent | 8b3c85ca8244eec0d01eea269922d780f73ccebb (diff) |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch b/target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch index f3055590ab..c1d9f681ed 100644 --- a/target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch +++ b/target/linux/generic/patches-3.6/600-netfilter_layer7_2.22.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -1053,6 +1053,27 @@ config NETFILTER_XT_MATCH_STATE +@@ -1119,6 +1119,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_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -105,6 +105,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) +@@ -112,6 +112,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 @@ -2059,7 +2059,7 @@ +} --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -214,6 +214,14 @@ destroy_conntrack(struct nf_conntrack *n +@@ -215,6 +215,14 @@ destroy_conntrack(struct nf_conntrack *n * too. */ nf_ct_remove_expectations(ct); @@ -2091,7 +2091,7 @@ --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h -@@ -134,6 +134,22 @@ struct nf_conn { +@@ -105,6 +105,22 @@ struct nf_conn { struct net *ct_net; #endif @@ -2132,7 +2132,7 @@ +#endif /* _XT_LAYER7_H */ --- a/include/linux/netfilter/Kbuild +++ b/include/linux/netfilter/Kbuild -@@ -49,6 +49,7 @@ header-y += xt_hashlimit.h +@@ -52,6 +52,7 @@ header-y += xt_hashlimit.h header-y += xt_helper.h header-y += xt_iprange.h header-y += xt_ipvs.h |