diff -r 2b6718f05bdb -r 8a27654f7b62 bluetooth/btstack/linkmgr/physicallinks.h
--- a/bluetooth/btstack/linkmgr/physicallinks.h	Fri Feb 19 23:56:55 2010 +0200
+++ b/bluetooth/btstack/linkmgr/physicallinks.h	Fri Mar 12 15:49:00 2010 +0200
@@ -487,6 +487,12 @@
 	
 	inline TBool IsAuthenticationPending() const;
 
+	void LinkKeyRequestResponseAttempt(TBool aForceResponse = EFalse);
+	void DoLinkKeyResponse(TBool aPositive);
+
+	void RemoteSimplePairingModeDetermined(TPhysicalLinkSimplePairingMode aSimplePairingMode);
+	void SetPeerInSecurityMode3();
+
 private: // from MPINCodeResponseHandler
 	TInt PINCodeRequestReply(const TBTDevAddr& aDevAddr,const TDesC8& aPin) const;
 	TInt PINCodeRequestNegativeReply(const TBTDevAddr& aDevAddr) const;
@@ -519,9 +525,11 @@
 	// the PHY's supported logical links...
 	RPointerArray<CACLLink>					iACLLogicalLinks;
 	CBTSynchronousLink*						iSyncLogicalLink; // stack only supports a signal one per PHY
-	
+
+	TBool						iLinkKeyRequestOutstanding;	// for if we have to wait for Registry or SSP support status
 
-	MPINCodeResponseHandler*	iPinHandler;
+	MPINCodeResponseHandler*	iPinHandler;		// for forwarding responses to
+
 	TBTConnect 					iLastPendingConnection;		// for if we have to wait for Registry to decide whether to rject or accept a connection
 	TBool						iPendingConnection;  // is a connection request waiting for a reply
 	TSglQue<CBTProxySAP>		iProxySAPs;			// the proxies bound to us
@@ -571,8 +579,6 @@
 	TBool						iNewPinCodeValid;
 	TBTPinCode					iNewPinCode;
 
-	TBool						iWaitingForLinkKeyFromRegistry;
-
 private:
 	/**
 	Enumeration to represent the current state of the physical links storage in the registry,