diff -r db85996de7c4 -r e9cc36e353d4 linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnbase.cpp --- a/linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnbase.cpp Mon Mar 15 12:46:10 2010 +0200 +++ b/linklayercontrol/networkinterfacemgr/netcfgext/src/netcfgextnbase.cpp Thu Apr 01 00:00:09 2010 +0300 @@ -579,6 +579,9 @@ iAsynchDaemonCancel = NULL; } } + + // Clear out outstanding RMessage2 as it is no longer outstanding (it will be completed elsewhere) + iMessage = ESock::RLegacyResponseMsg(); } //the RunL method will be called on the original request cancellation } @@ -733,8 +736,13 @@ } else { - // should never get here. - __ASSERT_DEBUG(EFalse, User::Panic(KSpecAssert_NifManNetCfgExtn, 10)); + + // Async cancel must have completed + // Start deregistration if it was queued up + if (iDeregisterOnCompletionOfRequest) + { + Deregister(iDeregistrationCauseCode); + } } // ******************************************** // CAREFUL... consider the possible deletion of