--- a/bluetooth/btstack/l2cap/l2sap.cpp	Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2sap.cpp	Wed Oct 13 15:48:34 2010 +0300
@@ -435,7 +435,7 @@
 		case KL2CAPUpdateChannelConfig:
 			{
 			const TL2CapConfig apiConf = *reinterpret_cast<const TL2CapConfig*>(aOption.Ptr());
-            return UpdateChannelConfig(apiConf);
+			return iL2CapSAPSignalHandler->UpdateChannelConfig(apiConf);
 			}
 			
 		// Can't set these
@@ -1084,11 +1084,6 @@
 
 	if(dataConfig)
 		{
-		// if UpdateChannelConfig was called before iL2CapDataQueue was created we update the priority now
-		if (iChannelPriority != 0)
-			{
-			dataConfig->SetChannelPriority(iChannelPriority);
-			}
 		TRAP(rerr, iL2CapDataQueue = CL2CapSDUQueue::NewL(*this,
 		                                                  aLocalPort,
 		                                                  aRemotePort,