--- a/bluetooth/btstack/linkmgr/physicallinksmanager.cpp	Wed Jul 21 15:42:05 2010 +0300
+++ b/bluetooth/btstack/linkmgr/physicallinksmanager.cpp	Thu Sep 23 17:06:47 2010 +0300
@@ -23,7 +23,7 @@
 #include "ProxySAP.h"
 
 #include <bt_sock.h>
-#include "PhysicalLinkHelper.h"
+#include "roleswitchhelper.h"
 #include "hostresolver.h"
 
 #include <bluetooth/hci/writepagetimeoutcommand.h>
@@ -583,6 +583,13 @@
 	found->MaxSlotsChange(aConnH, aSlots);
 	}
 
+void CPhysicalLinksManager::EncryptionKeyRefreshComplete(THCIErrorCode aErr, THCIConnHandle aConnH)
+	{
+	CPhysicalLink* found = FindPhysicalLink(aConnH);
+	RETURN_IF_NULL_CONNECTION(found);
+	found->EncryptionKeyRefreshComplete(aErr, aConnH);
+	}
+
 void CPhysicalLinksManager::ModeChange(THCIErrorCode aErr, THCIConnHandle aConnH, TBTLinkMode aMode, TBasebandTime aInterval)
 	{
 	CPhysicalLink* found = FindPhysicalLink(aConnH);
@@ -996,7 +1003,7 @@
  		// this the only role request, it's safe to kick off the state machine
  		// first suspend host resolver
  		LinkManagerProtocol().InquiryMgr().Suspend();
- 		aRoleSwitcher.Start();
+ 		aRoleSwitcher.StartHelper();
  		}
  	}
  
@@ -1016,7 +1023,7 @@
  	
  	if (startNextRoleSwitcher && !iRoleSwitchersQ.IsEmpty())
  		{
- 		iRoleSwitchersQ.First()->Start();
+ 		iRoleSwitchersQ.First()->StartHelper();
  		}
  	else 
  		{