From 3d1af0d10b7d62cb0aee3f95a4f111e7cd2fefcc Mon Sep 17 00:00:00 2001
From: Simon Kers <simon@inteno.se>
Date: Fri, 14 Mar 2014 12:31:16 +0100
Subject: [PATCH] Keypassphrase no longer changes to WEP. refs #4267

---
 scripts/functions/lan_device | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/functions/lan_device b/scripts/functions/lan_device
index e529eb3..36a8ba2 100644
--- a/scripts/functions/lan_device
+++ b/scripts/functions/lan_device
@@ -252,16 +252,16 @@ set_wlan_key_passphrase() {
 	local val="$2"
 	local encryption=`$UCI_GET wireless.@wifi-iface[$num].encryption`
 	delay_service reload "network" "1"
-	if [ $encryption != "wep-shared" -a $encryption != "wep-open" ] ; then
-		reset_wlan $nums
-		$UCI_SET wireless.@wifi-iface[$num].encryption="wep-open"
-		$UCI_SET wireless.@wifi-iface[$num].key="1"
+	if [ $encryption == "wep-shared" -o $encryption == "wep-open" ] ; then
+		for key in `/usr/sbin/wepkeygen 64 $val`;do
+			$UCI_SET wireless.@wifi-iface[$num].key$i="$key"
+			let i++
+		done
+	elif [ $encryption == "none" ];then
+		echo "error"
+	else
+		set_wlan_pre_shared_key $num $val
 	fi
-	local i=1
-	for key in `/usr/sbin/wepkeygen 64 $val`;do
-		$UCI_SET wireless.@wifi-iface[$num].key$i="$key"
-		let i++
-	done
 }
 
 get_wlan_wep_encryption_level() {