Set txpower since that seems to work fine now. Explicitly set authmode wpa here, though it's also handled by the supplicant/authenticator. Ticket #4516

1 files changed, 5 insertions, 2 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 9984963..8fbedb9 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2416,9 +2416,10 @@ function interface_wireless_configure($if, &$wl, &$wlcfg) {
 	}
 
 	/* handle txpower setting */
-	/* if($wlcfg['txpower'] <> "")
+	if($wlcfg['txpower'] <> "" && is_numeric($wlcfg['txpower'])) {
 		$wlcmd[] = "txpower " . escapeshellarg($wlcfg['txpower']);
-	*/
+	}
+	
 	/* handle wme option */
 	if(isset($wlcfg['wme']['enable'])) {
 		$wlcmd[] = "wme";
@@ -2448,6 +2449,8 @@ function interface_wireless_configure($if, &$wl, &$wlcfg) {
 			$i++;
 		}
 		$wlcmd[] = $wepset;
+	} else if (isset($wlcfg['wpa']['enable'])) {
+		$wlcmd[] = "authmode wpa wepmode off ";
 	} else {
 		$wlcmd[] = "authmode open wepmode off ";
 	}