From d94a76fa03e818ad4fdb0237361e0b1a23a6feb5 Mon Sep 17 00:00:00 2001 From: Vicente Date: Sun, 21 Jul 2013 09:52:34 +0200 Subject: [PATCH] KERNEL: tune kernel. UPnP: Default values when VLAN is compiled. --- release/src-rt/linux/linux-2.6/config_base | 2 +- release/src/router/nvram/defaults.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/release/src-rt/linux/linux-2.6/config_base b/release/src-rt/linux/linux-2.6/config_base index 4f673d645a..3c209840e2 100644 --- a/release/src-rt/linux/linux-2.6/config_base +++ b/release/src-rt/linux/linux-2.6/config_base @@ -1770,7 +1770,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_KERNEL is not set # CONFIG_HWSIM is not set CONFIG_CROSSCOMPILE=y -CONFIG_CMDLINE="root=/dev/mtdblock2 noinitrd console=ttyS0,115200" +CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs noinitrd init=/sbin/init console=ttyS0,115200" CONFIG_SYS_SUPPORTS_KGDB=y # diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c index f716ebda31..14a023ee7a 100644 --- a/release/src/router/nvram/defaults.c +++ b/release/src/router/nvram/defaults.c @@ -507,19 +507,21 @@ const defaults_t defaults[] = { #endif // forward-upnp - { "upnp_enable", "3" }, - { "upnp_secure", "1" }, - { "upnp_port", "0" }, + { "upnp_enable", "3" }, + { "upnp_secure", "1" }, + { "upnp_port", "0" }, { "upnp_ssdp_interval", "60" }, // SSDP interval - { "upnp_max_age", "180" }, // Max age - { "upnp_mnp", "0" }, - { "upnp_custom", "" }, - { "upnp_clean", "1" }, /* 0:Disable 1:Enable */ + { "upnp_max_age", "180" }, // Max age + { "upnp_mnp", "0" }, + { "upnp_custom", "" }, + { "upnp_clean", "1" }, /* 0:Disable 1:Enable */ { "upnp_clean_interval", "600" }, /* Cleaning interval in seconds */ { "upnp_clean_threshold", "20" }, /* Threshold for cleaning unused rules */ -#if 0 // disabled for miniupnpd - { "upnp_max_age", "180" }, // Max age - { "upnp_config", "0" }, +#ifdef TCONFIG_VLAN + { "upnp_lan", "1" }, + { "upnp_lan1", "0" }, + { "upnp_lan2", "0" }, + { "upnp_lan3", "0" }, #endif // qos -- 2.11.4.GIT