--- a/wlan_bearer/wlandbif_cd/src/wdbifwlansettings.cpp	Wed Jun 23 20:17:42 2010 +0300
+++ b/wlan_bearer/wlandbif_cd/src/wdbifwlansettings.cpp	Tue Jul 06 16:24:00 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12.1.1 %
+* %version: 14 %
 */
 
 //  INCLUDE FILES
@@ -167,7 +167,13 @@
         ReadWepKeysL(aSettings);           
         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL, Wep keys succesfully read")));
         }
-    else if( aSettings.SecurityMode > Wep)
+    else if( aSettings.SecurityMode == Wlan8021x )
+        {
+        aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
+        TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),
+            aSettings.WPAKeyLength));
+        }
+    else if( aSettings.SecurityMode > Wlan8021x )
         {
         aSettings.WPAKeyLength = *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength));
         TraceDump(WARNING_LEVEL,(_L("CWlanSettings::GetDataL() - aSettings.WPAKeyLength: %d"),