diff -r c40eb8fe8501 -r 6524e815f76f wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlmdriverif.cpp --- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlmdriverif.cpp Tue Feb 02 02:03:13 2010 +0200 +++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlmdriverif.cpp Sat Feb 20 00:38:18 2010 +0200 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -15,6 +15,9 @@ * */ +/* +* %version: 51 % +*/ #include #include "wlanlddcommon.h" @@ -824,7 +827,8 @@ const u8_t* scan_frame, bool_t is_pairwise_key_invalidated, bool_t is_group_key_invalidated, - bool_t is_radio_measurement_supported ) + bool_t is_radio_measurement_supported, + const core_cipher_key_s* pairwise_key ) { #ifdef _DEBUG if( is_infra == true_t ) @@ -850,6 +854,11 @@ TWlanConversionUtil::ConvertSSID( tmpSsid, ssid ); TMacAddress tmpBssid; TWlanConversionUtil::ConvertMacAddress( tmpBssid, bssid ); + TPairwiseKeyData tmpKey = { 0, 0 }; + if( pairwise_key ) + { + TWlanConversionUtil::ConvertCipherKey( tmpKey, *pairwise_key ); + } iManagementCommandHandler->Connect( tmpSsid, @@ -864,8 +873,8 @@ scan_frame, is_pairwise_key_invalidated, is_group_key_invalidated, - is_radio_measurement_supported ); - + is_radio_measurement_supported, + tmpKey ); } // -----------------------------------------------------------------------------