--- a/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Thu Aug 19 11:25:30 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/agentprcore/src/CAgentAdapter.cpp	Tue Aug 31 16:45:15 2010 +0300
@@ -71,7 +71,7 @@
     : iAgentScpr(aAgentScpr),
     iAgentState(EDisconnected),
     iAgentConnectType(EAgentNone),
-    iLastProgress(KFinishedSelection,KErrNone),iAgentErrorState(EFalse)
+    iLastProgress(KFinishedSelection,KErrNone)
     {
     }
 
@@ -148,18 +148,15 @@
 void CAgentAdapter::DisconnectAgent(TInt aReason)
     {
     if (iAgentState == EConnecting)
-        {    
+        {
         iAgent->CancelConnect();
         }
     else if (iAgentState == EReconnecting)
         {
         iAgent->CancelReconnect();
         }
-    if (iAgentState != EDisconnecting)
-        {        
-        iAgentState = EDisconnecting;
-    	iAgent->Disconnect(aReason);
-        }
+    iAgentState = EDisconnecting;
+    iAgent->Disconnect(aReason);
     }
 
 
@@ -310,8 +307,6 @@
         else
             {
             iLastProgress.iError = aStatus;
-            // set the agent state to EDisconnecting
-            iAgentState = EDisconnecting;
             iAgent->Disconnect(aStatus);
             }
         }
@@ -353,9 +348,9 @@
         {
 #ifdef __CFLOG_ACTIVE
     	TRAPD(err,
+    		//iAgentScpr.ProgressL(KConnectionUninitialised);
     		iAgentState = EDisconnected;
     		iAgentScpr.ConnectionDownL();
-    	//	iAgentScpr.ProgressL(KConnectionUninitialised);
     		);
             if (err != KErrNone)
                 {
@@ -364,9 +359,9 @@
                 }
 #else
     	TRAP_IGNORE(
+            //iAgentScpr.ProgressL(KConnectionUninitialised);
     		iAgentState = EDisconnected;
     		iAgentScpr.ConnectionDownL();
-            //iAgentScpr.ProgressL(KConnectionUninitialised);
     		);
 #endif
         }
@@ -396,7 +391,6 @@
     else
         {
         iAgentScpr.Error(iLastProgress);
-        iAgentErrorState = ETrue;
         }
     }