leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netvsc: change order of steps in setting queues

Browse Source 
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>
This commit is contained in:
stephen hemminger 2017-07-19 11:53:14 -07:00 committed by David S. Miller
parent 79e8cbe7a7
commit a5e1ec3833
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/hyperv/netvsc_drv.c
View File

@ -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,