mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15581 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
+#endif /* _XT_LAYER7_H */
|
||||
--- a/include/net/netfilter/nf_conntrack.h
|
||||
+++ b/include/net/netfilter/nf_conntrack.h
|
||||
@@ -127,6 +127,22 @@
|
||||
@@ -127,6 +127,22 @@ struct nf_conn
|
||||
u_int32_t secmark;
|
||||
#endif
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
--- a/net/netfilter/Kconfig
|
||||
+++ b/net/netfilter/Kconfig
|
||||
@@ -633,6 +633,27 @@
|
||||
@@ -633,6 +633,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_XTABLES
|
||||
--- a/net/netfilter/Makefile
|
||||
+++ b/net/netfilter/Makefile
|
||||
@@ -71,6 +71,7 @@
|
||||
@@ -71,6 +71,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
|
||||
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
|
||||
@@ -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
|
||||
@@ -207,6 +207,14 @@
|
||||
@@ -207,6 +207,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
|
||||
@@ -179,6 +179,11 @@
|
||||
@@ -179,6 +179,11 @@ static int ct_seq_show(struct seq_file *
|
||||
return -ENOSPC;
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user