Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5e1ec38 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79e8cbe7

drivers/net/hyperv/netvsc_drv.c

+3 −5
Original line number Diff line number Diff line
@@ -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 rndis_filter_device_add(dev, &device_info);

}



static int netvsc_set_channels(struct net_device *net,