From 1c794864677b9362dd7a121b14f56eba55e84c97 Mon Sep 17 00:00:00 2001
From: Gujs <gujs.lists@gmail.com>
Date: Wed, 1 Jun 2011 20:28:04 +0200
Subject: [PATCH] WiFi: rename PSK to WPA/WPA2 for better understanding

---
 .../xbmc-addon-settings/source/resources/settings.xml         | 2 +-
 packages/network/connman/config/network.conf                  | 4 ++--
 packages/network/connman/init.d/21_network                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index 493b522f7f..c804349a18 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -39,7 +39,7 @@
 		<setting type="sep" />
 		<setting id="NET_SSID" type="text" label="2151" default=""/>
 <!-- 		<setting id="NET_HIDDEN" type="bool" label="2152" default="false" /> -->
-		<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|PSK|WEP" sort="yes" default="NONE" />
+		<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" />
 		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default=""  enable="!eq(-1,0)"/>
     </category>
 
diff --git a/packages/network/connman/config/network.conf b/packages/network/connman/config/network.conf
index b630acfabd..cf82b67066 100644
--- a/packages/network/connman/config/network.conf
+++ b/packages/network/connman/config/network.conf
@@ -67,10 +67,10 @@
 # WLAN Security
 # This option lets you chose the security protocol for your wireless
 # network
-# Options are "NONE" / "WEP" / "PSK" )
+# Options are "NONE" / "WEP" / "WPA/WPA2" )
 # "NONE" or left blank for an open WLAN (default)
 # "WEP" for WEP protected WLAN's
-# "PSK" for WPA protected WLAN's
+# "WPA/WPA2" for WPA protected WLAN's
   SECURITY=""
 
 # WLAN Passphrase
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 396ab400a6..c82b6472c6 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -64,10 +64,10 @@ fi
     if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
       NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
 
-      # NET_SECURITY: ( NONE / WEP / PSK )
+      # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
         if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
           MODE="managed_wep"
-        elif [ "$NET_SECURITY" = "PSK" -a -n "$NET_PASSPHRASE"  ]; then
+        elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE"  ]; then
           MODE="managed_psk"
         else
           MODE="managed_none"