Merge mozilla-central to autoland. a=merge on a CLOSED TREE

netwerk/sctp/datachannel/DataChannel.cpp

@@ -265,7 +265,6 @@ static DataChannelConnection *GetConnectionFromSocket(struct socket *sock) {
 static int threshold_event(struct socket *sock, uint32_t sb_free) {
   DataChannelConnection *connection = GetConnectionFromSocket(sock);
   if (connection) {
-    MutexAutoLock lock(connection->mLock);
     connection->SendDeferredMessages();
   } else {
     LOG(("Can't find connection for socket %p", sock));
@@ -842,6 +841,7 @@ void DataChannelConnection::SctpDtlsInput(const std::string &aTransportId,
     }
   }
   // Pass the data to SCTP
+  MutexAutoLock lock(mLock);
   usrsctp_conninput(static_cast<void *>(this), packet.data(), packet.len(), 0);
 }
 
@@ -2313,7 +2313,7 @@ int DataChannelConnection::ReceiveCallback(struct socket *sock, void *data,
   if (!data) {
     LOG(("ReceiveCallback: SCTP has finished shutting down"));
   } else {
-    MutexAutoLock lock(mLock);
+    mLock.AssertCurrentThreadOwns();
     if (flags & MSG_NOTIFICATION) {
       HandleNotification(static_cast<union sctp_notification *>(data), datalen);
     } else {