Browse Source

netvsc: change order of steps in setting queues

This fixes the error unwind logic for incorrect number of queues.
If netif_set_real_num_XX_queues failed then rndis_filter_device_add
would have been called twice. Since input arguments are already
ranged checked this is a hypothetical only problem, not possible
in actual code.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
stephen hemminger 8 years ago
parent
commit
a5e1ec3833
1 changed files with 3 additions and 5 deletions
  1. 3 5
      drivers/net/hyperv/netvsc_drv.c

+ 3 - 5
drivers/net/hyperv/netvsc_drv.c

@@ -724,17 +724,15 @@ static int netvsc_set_queues(struct net_device *net, struct hv_device *dev,
 	device_info.ring_size = ring_size;
 	device_info.ring_size = ring_size;
 	device_info.max_num_vrss_chns = num_chn;
 	device_info.max_num_vrss_chns = num_chn;
 
 
-	ret = rndis_filter_device_add(dev, &device_info);
-	if (ret)
-		return ret;
-
 	ret = netif_set_real_num_tx_queues(net, num_chn);
 	ret = netif_set_real_num_tx_queues(net, num_chn);
 	if (ret)
 	if (ret)
 		return ret;
 		return ret;
 
 
 	ret = netif_set_real_num_rx_queues(net, num_chn);
 	ret = netif_set_real_num_rx_queues(net, num_chn);
+	if (ret)
+		return ret;
 
 
-	return ret;
+	return rndis_filter_device_add(dev, &device_info);
 }
 }
 
 
 static int netvsc_set_channels(struct net_device *net,
 static int netvsc_set_channels(struct net_device *net,