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>

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index e8e82a6a4b1ae806875efbd360ddbd2d136c5e0d..91637336d1fb218efbdd42f5ace02dea3a688169 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/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.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);
        if (ret)
                return ret;
 
        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,