aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-02-04 10:02:56 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-02-04 10:02:56 +0000
commit08ff97672027a8d1fa148779c0fa06e154dd0a85 (patch)
tree192e36ae3d147122f2d6b79cd9f30db25eb4a1e9 /target/linux/generic/patches-3.7
parentb20cb26ed78ffce64c436adbb0428c5edfaf38b4 (diff)
downloadupstream-08ff97672027a8d1fa148779c0fa06e154dd0a85.tar.gz
upstream-08ff97672027a8d1fa148779c0fa06e154dd0a85.tar.bz2
upstream-08ff97672027a8d1fa148779c0fa06e154dd0a85.zip
kernel: update linux 3.7 to 3.7.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35476
Diffstat (limited to 'target/linux/generic/patches-3.7')
-rw-r--r--target/linux/generic/patches-3.7/250-netfilter_depends.patch2
-rw-r--r--target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch2
-rw-r--r--target/linux/generic/patches-3.7/603-netfilter_layer7_2.6.36_fix.patch4
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.7/250-netfilter_depends.patch b/target/linux/generic/patches-3.7/250-netfilter_depends.patch
index 3c9013400a..218df4cfb1 100644
--- a/target/linux/generic/patches-3.7/250-netfilter_depends.patch
+++ b/target/linux/generic/patches-3.7/250-netfilter_depends.patch
@@ -8,7 +8,7 @@
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -750,7 +749,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -757,7 +756,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
diff --git a/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch b/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch
index 0c8c5e890b..55daeab7ae 100644
--- a/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch
+++ b/target/linux/generic/patches-3.7/600-netfilter_layer7_2.22.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -1176,6 +1176,27 @@ config NETFILTER_XT_MATCH_STATE
+@@ -1183,6 +1183,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
diff --git a/target/linux/generic/patches-3.7/603-netfilter_layer7_2.6.36_fix.patch b/target/linux/generic/patches-3.7/603-netfilter_layer7_2.6.36_fix.patch
index 23a1b1b26d..e3f203289e 100644
--- a/target/linux/generic/patches-3.7/603-netfilter_layer7_2.6.36_fix.patch
+++ b/target/linux/generic/patches-3.7/603-netfilter_layer7_2.6.36_fix.patch
@@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -980,6 +980,27 @@ config NETFILTER_XT_MATCH_IPVS
+@@ -987,6 +987,27 @@ config NETFILTER_XT_MATCH_IPVS
If unsure, say N.
@@ -28,7 +28,7 @@
config NETFILTER_XT_MATCH_LENGTH
tristate '"length" match support'
depends on NETFILTER_ADVANCED
-@@ -1176,26 +1197,11 @@ config NETFILTER_XT_MATCH_STATE
+@@ -1183,26 +1204,11 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.