summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-07 09:12:56 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-07 09:12:56 +0000
commit3a9112def3e10fcfd630167eed2042c5ce6cf10b (patch)
tree15d2ddfc3a819c6837c86ce358b63dc59c0655a6
parent0a144624ce29c0b5b9a85666924a9540d283dba7 (diff)
upgrade to 2.6.15.6, fix default config for Aruba
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3324 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/aruba-2.6/Makefile4
-rw-r--r--target/linux/aruba-2.6/config7
-rw-r--r--target/linux/aruba-2.6/config-ramdisk7
-rw-r--r--target/linux/brcm-2.6/Makefile4
-rw-r--r--target/linux/x86-2.6/Makefile4
5 files changed, 20 insertions, 6 deletions
diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile
index f1cf278c0..667f976c4 100644
--- a/target/linux/aruba-2.6/Makefile
+++ b/target/linux/aruba-2.6/Makefile
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
-LINUX_VERSION:=2.6.15.3
+LINUX_VERSION:=2.6.15.6
LINUX_RELEASE:=1
-LINUX_KERNEL_MD5SUM:=57a8675485bbc4982e9267fab6b24519
+LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca
include ../rules.mk
include ./config
diff --git a/target/linux/aruba-2.6/config b/target/linux/aruba-2.6/config
index 3274728f3..2985f364e 100644
--- a/target/linux/aruba-2.6/config
+++ b/target/linux/aruba-2.6/config
@@ -325,6 +325,7 @@ CONFIG_IP_NF_MATCH_OWNER=m
# CONFIG_IP_NF_MATCH_STRING is not set
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_IMQ=m
# CONFIG_IP_NF_TARGET_LOG is not set
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=y
@@ -718,6 +719,12 @@ CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
+CONFIG_IMQ=m
+# CONFIG_IMQ_BEHAVIOR_AA is not set
+# CONFIG_IMQ_BEHAVIOR_AB is not set
+CONFIG_IMQ_BEHAVIOR_BA=y
+# CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IMQ_NUM_DEVS=2
CONFIG_TUN=m
#
diff --git a/target/linux/aruba-2.6/config-ramdisk b/target/linux/aruba-2.6/config-ramdisk
index 2d0c1a0a7..9647df2d8 100644
--- a/target/linux/aruba-2.6/config-ramdisk
+++ b/target/linux/aruba-2.6/config-ramdisk
@@ -328,6 +328,7 @@ CONFIG_IP_NF_MATCH_OWNER=m
# CONFIG_IP_NF_MATCH_STRING is not set
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_IMQ=m
# CONFIG_IP_NF_TARGET_LOG is not set
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=y
@@ -719,6 +720,12 @@ CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
+CONFIG_IMQ=m
+# CONFIG_IMQ_BEHAVIOR_AA is not set
+# CONFIG_IMQ_BEHAVIOR_AB is not set
+CONFIG_IMQ_BEHAVIOR_BA=y
+# CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IMQ_NUM_DEVS=2
CONFIG_TUN=m
#
diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile
index 9495d326d..5514e478d 100644
--- a/target/linux/brcm-2.6/Makefile
+++ b/target/linux/brcm-2.6/Makefile
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
-LINUX_VERSION:=2.6.15.3
+LINUX_VERSION:=2.6.15.6
LINUX_RELEASE:=1
-LINUX_KERNEL_MD5SUM:=57a8675485bbc4982e9267fab6b24519
+LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca
include ../rules.mk
include ./config
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile
index e7c18fcc5..887606ea7 100644
--- a/target/linux/x86-2.6/Makefile
+++ b/target/linux/x86-2.6/Makefile
@@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
-LINUX_VERSION:=2.6.15.3
+LINUX_VERSION:=2.6.15.6
LINUX_RELEASE:=1
-LINUX_KERNEL_MD5SUM:=57a8675485bbc4982e9267fab6b24519
+LINUX_KERNEL_MD5SUM:=2ea7c865d6c09a02cbe6ce5fddcd02ca
include ../rules.mk
include ./config