]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
hv_netvsc: Simplify the limit check in netvsc_set_channels()
authorHaiyang Zhang <haiyangz@microsoft.com>
Fri, 1 Sep 2017 21:30:06 +0000 (14:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Sep 2017 03:39:12 +0000 (20:39 -0700)
Because of the following code, net->num_tx_queues equals to
VRSS_CHANNEL_MAX, and max_chn is less than or equals to VRSS_CHANNEL_MAX.

netvsc_drv.c:
alloc_etherdev_mq(sizeof(struct net_device_context),
                                VRSS_CHANNEL_MAX);
rndis_filter.c:
net_device->max_chn = min_t(u32, VRSS_CHANNEL_MAX, num_possible_rss_qs);

So this patch removes the unnecessary limit check before comparing
with "max_chn".

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/netvsc_drv.c

index 992a48ec02065b4c33c60911846339bdfa97ef20..fd65d32bf24df7e73617b03431943c51f4abb846 100644 (file)
@@ -830,9 +830,6 @@ static int netvsc_set_channels(struct net_device *net,
            channels->rx_count || channels->tx_count || channels->other_count)
                return -EINVAL;
 
-       if (count > net->num_tx_queues || count > VRSS_CHANNEL_MAX)
-               return -EINVAL;
-
        if (!nvdev || nvdev->destroy)
                return -ENODEV;