From d16c66f743b2bd3e77b21b7aab0b49ef1aafedf7 Mon Sep 17 00:00:00 2001
From: Toastman <toastman@galactic_core>
Date: Tue, 15 Nov 2011 18:11:27 +0700
Subject: [PATCH] fix wireless mitigation setting (again), correction to
 makefile

---
 release/src/Makefile                         | 16 ++++++++++++++--
 release/src/router/www/advanced-wireless.asp |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/release/src/Makefile b/release/src/Makefile
index 386095b1d4..fed7615980 100644
--- a/release/src/Makefile
+++ b/release/src/Makefile
@@ -711,6 +711,14 @@ else
 	@$(MAKE) bin OPENVPN=y BBEXTRAS=y BCM57=y B=V BUILD_DESC="$(VPN)" USB=""  SNMP=y VLAN="$(VLAN)"
 endif
 
+## Make the "Small VPN with no USB support" build
+vs:
+ifeq ($(CONFIG_LINUX26),y)
+	@$(MAKE) bin OPENVPN=y NO_JFFS=y NO_CIFS=y B=V BUILD_DESC="SmallVPN" USB=""
+else
+	@$(MAKE) bin OPENVPN=y NO_JFFS=y NO_CIFS=y BCM57=y B=VS BUILD_DESC="SmallVPN" USB=""
+endif
+
 ## Make Mips32r2 builds
 
 r2a:
@@ -758,6 +766,9 @@ r2t:
 r2v:
 	@$(MAKE) v MIPS32=r2
 
+r2vs:
+	@$(MAKE) vs MIPS32=r2
+
 n60a:
 	@$(MAKE) r2a NVRAM_SIZE=60 LINKSYS_E=y
 
@@ -786,13 +797,13 @@ n60r:
 	@$(MAKE) r2r NVRAM_SIZE=60 LINKSYS_E=y
 
 n60s:
-	@$(MAKE) bin MIPS32=r2 B=S USB="" NVRAM_SIZE=60 LINKSYS_E=1 BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y BUILD_DESC="Std"
+	@$(MAKE) bin MIPS32=r2 B=S USB="" NVRAM_SIZE=60 LINKSYS_E=y BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y BUILD_DESC="Std"
 
 n60t:
 	@$(MAKE) r2t NVRAM_SIZE=60 LINKSYS_E=y
 
 n60v:
-	@$(MAKE) bin MIPS32=r2 B=V USB="" NVRAM_SIZE=60 LINKSYS_E=1 BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y OPENVPN=y BUILD_DESC="$(VPN)"
+	@$(MAKE) bin MIPS32=r2 B=V USB="" NVRAM_SIZE=60 LINKSYS_E=y BBEXTRAS=y EBTABLES=y NO_LIBOPT=y IPV6SUPP=y OPENVPN=y BUILD_DESC="$(VPN)"
 
 
 setprofile:
@@ -879,6 +890,7 @@ ifeq ($(CONFIG_LINUX26),y)
 	@echo "r2nc         MIPS Release 2 NC build (standard plus VPN, extras and NOCAT)"
 	@echo "r2s          MIPS Release 2 S build (no USB support)"
 	@echo "r2v          MIPS Release 2 V build (VPN with no USB support)"
+	@echo "r2v          MIPS Release 2 V build (Small VPN with no USB support)"
 	@echo "n60m         Linksys E-series build (60KB NVRAM, standard plus extras)"
 	@echo "n60e         Linksys E-series build (60KB NVRAM, standard plus VPN and extras)"
 	@echo "n60nc        Linksys E-series build (60KB NVRAM, standard plus extras, plus VPN, plus NOCAT)"
diff --git a/release/src/router/www/advanced-wireless.asp b/release/src/router/www/advanced-wireless.asp
index 9379b9fba8..32a219ca8a 100644
--- a/release/src/router/www/advanced-wireless.asp
+++ b/release/src/router/www/advanced-wireless.asp
@@ -188,8 +188,8 @@ if (wl_sunit(uidx)<0) {
 		{ title: 'Transmission Rate', name: 'wl'+u+'_rate', type: 'select',
 			options: [['0','Auto *'],['1000000','1 Mbps'],['2000000','2 Mbps'],['5500000','5.5 Mbps'],['6000000','6 Mbps'],['9000000','9 Mbps'],['11000000','11 Mbps'],['12000000','12 Mbps'],['18000000','18 Mbps'],['24000000','24 Mbps'],['36000000','36 Mbps'],['48000000','48 Mbps'],['54000000','54 Mbps']],
 			value: nvram['wl'+u+'_rate'] },
-		{ title: 'Interference Mitigation', name: 'wl'+u+'_mitigation', type: 'select',
-			options: [['0','None'],['1','Non-WLAN'],['2','WLAN Manual'],['3','WLAN Auto *']],
+	{ title: 'Interference Mitigation', name: 'wl'+u+'_mitigation', type: 'select',
+			options: [['0','None *'],['1','Non-WLAN'],['2','WLAN Manual'],['3','WLAN Auto'],['4','WLAN Auto with Noise Reduction']],
 			value: nvram['wl'+u+'_mitigation'] },
 		{ title: 'WMM', name: 'wl'+u+'_wme', type: 'select', options: [['auto','Auto *'],['off','Disable'],['on','Enable']], value: nvram['wl'+u+'_wme'] },
 		{ title: 'No ACK', name: 'wl'+u+'_wme_no_ack', indent: 2, type: 'select', options: [['off','Disable *'],['on','Enable']],
-- 
2.11.4.GIT