RH7 : hv_netvsc: Fix the order of num_sc_offered decrement

LIS · Apr 17, 2016 · cc44001 · cc44001
1 parent 51a37ca
commit cc44001
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/hv-rhel7.x/hv/rndis_filter.c b/hv-rhel7.x/hv/rndis_filter.c
@@ -986,11 +986,6 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)
 
 	nvscdev = hv_get_drvdata(new_sc->primary_channel->device_obj);
 
-	spin_lock_irqsave(&nvscdev->sc_lock, flags);
-	nvscdev->num_sc_offered--;
-	spin_unlock_irqrestore(&nvscdev->sc_lock, flags);
-	if (nvscdev->num_sc_offered == 0)
-		complete(&nvscdev->channel_init_wait);
 
 	if (chn_index >= nvscdev->num_chn)
 		return;
@@ -1004,6 +999,14 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)
 
 	if (ret == 0)
 		nvscdev->chn_table[chn_index] = new_sc;
+
+	spin_lock_irqsave(&nvscdev->sc_lock, flags);
+        nvscdev->num_sc_offered--;
+        spin_unlock_irqrestore(&nvscdev->sc_lock, flags);
+        if (nvscdev->num_sc_offered == 0)
+                complete(&nvscdev->channel_init_wait);
+
+
 }
 
 int rndis_filter_device_add(struct hv_device *dev,