mozilla-central: changeset 124623:8b15e0890b1f75b2caac8d1a821a8790e060f149

author	Thomas Zimmermann <tzimmermann@mozilla.com>
	Tue, 12 Mar 2013 14:27:59 -0700
changeset 124623	8b15e0890b1f75b2caac8d1a821a8790e060f149
parent 124622	2b4945329805968a62812215cd9c47967eacd053
child 124624	838efa504a6b3629ae32edb85c57adf0cc741cbe
push id	24427
push user	emorley@mozilla.com
push date	Wed, 13 Mar 2013 12:28:55 +0000
treeherder	mozilla-central@072b936973fe [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	qdot, echou
bugs	843958
milestone	22.0a1
first release with	nightly linux32 b672877ed046 / 22.0a1 / 20130314030914 / files nightly linux64 b672877ed046 / 22.0a1 / 20130314030914 / files nightly mac b672877ed046 / 22.0a1 / 20130314030914 / files nightly win32 b672877ed046 / 22.0a1 / 20130314030914 / files nightly win64 b672877ed046 / 22.0a1 / 20130314030914 / files
last release without	nightly linux32 7433bc4545c9 / 22.0a1 / 20130312031046 / files nightly linux64 7433bc4545c9 / 22.0a1 / 20130312031046 / files nightly mac 7433bc4545c9 / 22.0a1 / 20130312031046 / files nightly win32 7433bc4545c9 / 22.0a1 / 20130312031046 / files nightly win64 eccf45749400 / 22.0a1 / 20130311030946 / files

--- a/dom/bluetooth/BluetoothUnixSocketConnector.cpp
+++ b/dom/bluetooth/BluetoothUnixSocketConnector.cpp
@@ -80,16 +80,17 @@ BluetoothUnixSocketConnector::SetUp(int 
     lm |= mAuth ? RFCOMM_LM_AUTH : 0;
     lm |= mEncrypt ? RFCOMM_LM_ENCRYPT : 0;
     break;
   case BluetoothSocketType::L2CAP:
     lm |= mAuth ? L2CAP_LM_AUTH : 0;
     lm |= mEncrypt ? L2CAP_LM_ENCRYPT : 0;
     break;
   case BluetoothSocketType::SCO:
+    break;
   default:
     MOZ_NOT_REACHED("Unknown socket type!");
   }
 
   if (lm) {
     if (setsockopt(aFd, SOL_RFCOMM, RFCOMM_LM, &lm, sizeof(lm))) {
       NS_WARNING("setsockopt(RFCOMM_LM) failed, throwing");
       return false;