--- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanconversionutil.cpp	Fri Mar 19 10:03:22 2010 +0200
+++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanconversionutil.cpp	Fri Apr 16 16:56:12 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 84 %
+* %version: 84.1.2 %
 */
 
 #include <in_sock.h>
@@ -649,6 +649,8 @@
 	aCoreSettings.rcpi_trigger = static_cast<u32_t>( aAmSettings.rcpiTrigger );
 	aCoreSettings.active_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minActiveChannelTime );
 	aCoreSettings.active_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxActiveChannelTime );
+	aCoreSettings.active_broadcast_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minActiveBroadcastChannelTime );
+	aCoreSettings.active_broadcast_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxActiveBroadcastChannelTime );	
 	aCoreSettings.passive_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minPassiveChannelTime );
 	aCoreSettings.passive_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxPassiveChannelTime );
     aCoreSettings.max_tx_msdu_life_time = static_cast<u32_t>( aAmSettings.maxTxMSDULifeTime );
@@ -853,8 +855,8 @@
         Mem::Copy(
             aCoreSettings.wpa_preshared_key.key_data,
             aAmSettings.WPAPreSharedKey.Ptr(),
-            aAmSettings.WPAKeyLength );
-        aCoreSettings.wpa_preshared_key.key_length = aAmSettings.WPAKeyLength;
+            aAmSettings.WPAPreSharedKey.Length() );
+        aCoreSettings.wpa_preshared_key.key_length = aAmSettings.WPAPreSharedKey.Length();
         }
 
     // Handle