--- a/bluetooth/btstack/l2cap/l2sap.cpp	Thu Jul 15 19:55:36 2010 +0300
+++ b/bluetooth/btstack/l2cap/l2sap.cpp	Thu Aug 19 11:01:00 2010 +0300
@@ -435,7 +435,7 @@
 		case KL2CAPUpdateChannelConfig:
 			{
 			const TL2CapConfig apiConf = *reinterpret_cast<const TL2CapConfig*>(aOption.Ptr());
-			return iL2CapSAPSignalHandler->UpdateChannelConfig(apiConf);
+            return UpdateChannelConfig(apiConf);
 			}
 			
 		// Can't set these
@@ -1084,6 +1084,11 @@
 
 	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,