diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2006-03-07 09:12:56 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2006-03-07 09:12:56 +0000 |
| commit | ba1d0338a260f92dfd8f6c71dd426f71cb22b7ba (patch) | |
| tree | 2aae6383063a0f8b3d78afd7700d1dd969254d52 | |
| parent | ec6fc7c51c785752276de291374d0457802d3114 (diff) | |
| download | upstream-ba1d0338a260f92dfd8f6c71dd426f71cb22b7ba.tar.gz upstream-ba1d0338a260f92dfd8f6c71dd426f71cb22b7ba.tar.bz2 upstream-ba1d0338a260f92dfd8f6c71dd426f71cb22b7ba.zip | |
upgrade to 2.6.15.6, fix default config for Aruba
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3324 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/target/linux/aruba-2.6/Makefile | 4 | ||||
| -rw-r--r-- | openwrt/target/linux/aruba-2.6/config | 7 | ||||
| -rw-r--r-- | openwrt/target/linux/aruba-2.6/config-ramdisk | 7 | ||||
| -rw-r--r-- | openwrt/target/linux/brcm-2.6/Makefile | 4 | ||||
| -rw-r--r-- | openwrt/target/linux/x86-2.6/Makefile | 4 |
5 files changed, 20 insertions, 6 deletions
diff --git a/openwrt/target/linux/aruba-2.6/Makefile b/openwrt/target/linux/aruba-2.6/Makefile index f1cf278c045..667f976c49c 100644 --- a/openwrt/target/linux/aruba-2.6/Makefile +++ b/openwrt/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/openwrt/target/linux/aruba-2.6/config b/openwrt/target/linux/aruba-2.6/config index 3274728f383..2985f364ec5 100644 --- a/openwrt/target/linux/aruba-2.6/config +++ b/openwrt/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/openwrt/target/linux/aruba-2.6/config-ramdisk b/openwrt/target/linux/aruba-2.6/config-ramdisk index 2d0c1a0a71f..9647df2d8e2 100644 --- a/openwrt/target/linux/aruba-2.6/config-ramdisk +++ b/openwrt/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/openwrt/target/linux/brcm-2.6/Makefile b/openwrt/target/linux/brcm-2.6/Makefile index 9495d326d42..5514e478dac 100644 --- a/openwrt/target/linux/brcm-2.6/Makefile +++ b/openwrt/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/openwrt/target/linux/x86-2.6/Makefile b/openwrt/target/linux/x86-2.6/Makefile index e7c18fcc564..887606ea750 100644 --- a/openwrt/target/linux/x86-2.6/Makefile +++ b/openwrt/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 |