diff -r a0fdcd0e4c56 -r 7d966ab5304a wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanmgmtimpl.cpp --- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanmgmtimpl.cpp Fri Jun 04 12:12:29 2010 +0300 +++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanmgmtimpl.cpp Fri Jun 18 09:56:50 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 31 % +* %version: 32 % */ // INCLUDE FILES @@ -530,7 +530,8 @@ // void CWlanMgmtImpl::RunProtectedSetup( TRequestStatus& aStatus, - TUint32 aId, + const TWlanSsid& aSsid, + const TWlanWpsPin& aWpsPin, CArrayFixSeg& aCredentials ) { TraceDump( INFO_LEVEL, ( _L( "CWlanMgmtImpl::RunProtectedSetup()" ) ) ); @@ -540,7 +541,7 @@ aStatus = KRequestPending; iPendingProtectedSetupStatus = &aStatus; - iProtectedSetupRequest = new CProtectedSetupRequest( *this, iServer, aId, aCredentials ); + iProtectedSetupRequest = new CProtectedSetupRequest( *this, iServer, aSsid, aWpsPin, aCredentials ); if ( !iProtectedSetupRequest ) { User::RequestComplete( iPendingProtectedSetupStatus, KErrNoMemory ); @@ -1140,12 +1141,14 @@ CProtectedSetupRequest::CProtectedSetupRequest( CWlanMgmtImpl& aCallback, RWLMServer& aServer, - TUint32 aId, + const TWlanSsid& aSsid, + const TWlanWpsPin& aWpsPin, CArrayFixSeg& aCredentials ) : CActive( CActive::EPriorityStandard ), iCallback( aCallback ), iServer( aServer ), - iServiceId( aId ), + iSsid( aSsid ), + iWpsPin( aWpsPin ), iCredentials ( aCredentials ), iCredentialsBuf( iCredentialsStorage ) { @@ -1168,7 +1171,7 @@ void CProtectedSetupRequest::IssueRequest() { TraceDump( INFO_LEVEL, ( _L( "CProtectedSetupRequest::IssueRequest()" ) ) ); - iServer.RunProtectedSetup( iStatus, iServiceId, iCredentialsBuf ); + iServer.RunProtectedSetup( iStatus, iSsid, iWpsPin, iCredentialsBuf ); SetActive(); }