Skip to content

Commit a5e1ec3

Browse files
shemmingerdavem330
authored andcommitted
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>
1 parent 79e8cbe commit a5e1ec3

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/net/hyperv/netvsc_drv.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -724,17 +724,15 @@ static int netvsc_set_queues(struct net_device *net, struct hv_device *dev,
724724
device_info.ring_size = ring_size;
725725
device_info.max_num_vrss_chns = num_chn;
726726

727-
ret = rndis_filter_device_add(dev, &device_info);
728-
if (ret)
729-
return ret;
730-
731727
ret = netif_set_real_num_tx_queues(net, num_chn);
732728
if (ret)
733729
return ret;
734730

735731
ret = netif_set_real_num_rx_queues(net, num_chn);
732+
if (ret)
733+
return ret;
736734

737-
return ret;
735+
return rndis_filter_device_add(dev, &device_info);
738736
}
739737

740738
static int netvsc_set_channels(struct net_device *net,

0 commit comments

Comments
 (0)