Changeset 13740 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Nov 3, 2008 5:34:30 AM (16 years ago)

Author:

vboxsync

Message:

lock order fixed

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• if.c (modified) (2 diffs)
• slirp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/slirp/if.c

@@ -342 +342 @@
 #endif
             VBOX_SLIRP_LOCK(ifm->m_mutex);
+            VBOX_SLIRP_UNLOCK(pData->if_fastq_mutex);
         } else {
             VBOX_SLIRP_UNLOCK(pData->if_fastq_mutex);
@@ -356 +357 @@
                 next_m = ifm->ifq_next;
                 VBOX_SLIRP_UNLOCK(pData->next_m_mutex);
-        }
-#ifdef VBOX_WITH_SYNC_SLIRP
+                VBOX_SLIRP_UNLOCK(pData->if_batchq_mutex);
+        }
         VBOX_SLIRP_LOCK(ifm->m_mutex);
         VBOX_SLIRP_LOCK(pData->if_queued_mutex);
+#ifdef VBOX_WITH_SYNC_SLIRP
         if (if_queued == 0) {
             if (on_fast) {
-                VBOX_SLIRP_UNLOCK(pData->if_fastq_mutex);
+                VBOX_SLIRP_LOCK(pData->if_fastq_mutex);
             }else {
-                VBOX_SLIRP_UNLOCK(pData->if_batchq_mutex);
+                VBOX_SLIRP_LOCK(pData->if_batchq_mutex);
             }
             goto done;

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -761 +761 @@
             VBOX_SLIRP_LOCK(pData->if_queued_mutex);
             if (if_queued > 0){
-VBOX_SLIRP_UNLOCK(pData->if_queued_mutex);
+                VBOX_SLIRP_UNLOCK(pData->if_queued_mutex);
                 if_start(pData);
             }
             else {
-VBOX_SLIRP_UNLOCK(pData->if_queued_mutex);
+                VBOX_SLIRP_UNLOCK(pData->if_queued_mutex);
             }
         }