From patchwork Fri Sep 1 21:30:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haiyang Zhang X-Patchwork-Id: 809020 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xkXWr68pZz9sPt for ; Sat, 2 Sep 2017 07:32:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707AbdIAVbX (ORCPT ); Fri, 1 Sep 2017 17:31:23 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:44668 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752663AbdIAVbV (ORCPT ); Fri, 1 Sep 2017 17:31:21 -0400 Received: from linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id ntW7d0U8lDbVLntW7dK02I; Fri, 01 Sep 2017 14:30:19 -0700 x-originating-ip: 107.180.71.197 Received: from haiyangz by linuxonhyperv.com with local (Exim 4.89) (envelope-from ) id 1dntW7-0002hY-Qd; Fri, 01 Sep 2017 14:30:19 -0700 From: Haiyang Zhang To: davem@davemloft.net, netdev@vger.kernel.org Cc: haiyangz@microsoft.com, kys@microsoft.com, olaf@aepfle.de, vkuznets@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH net-next, 3/4] hv_netvsc: Simplify the limit check in netvsc_set_channels() Date: Fri, 1 Sep 2017 14:30:06 -0700 Message-Id: <20170901213007.10325-4-haiyangz@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170901213007.10325-1-haiyangz@exchange.microsoft.com> References: <20170901213007.10325-1-haiyangz@exchange.microsoft.com> Reply-To: haiyangz@microsoft.com X-CMAE-Envelope: MS4wfH8t323ibhjgZz2OxtdXsU/ZgzRJ0wNIlYm3uigV0gUoJfUTjpvcfFEX8zxYnc76YSRaSwNjWZBej9QW7IILzItIJLzmiXZYEKiXAafQtSgtXeliCGPV chCY+Wi+cFsWBlYvxBQMOZdF3W3tdejlWtLLNS3Pcj1AP8wAb7IHUe5BPjADzURvPakX+nwszh3gmoIkvDcaVMOFV994qh4B9pY/ZjB82IDxy1nRYqAb9Eb+ 7kifPlBZZ23WDoh2yUM2J3eVpc8c+KDlTGrpl5fkK7+Nbzi/tkKPTfb/1jP11KZ2gvrAXzG/08M03GgL2XpUBF4XswXWb32n+oNvkQ4fSy3Iy1UD3H3QTXdF f1M1XU9biLRUh4b96lzBLXL+KsgSrQ== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Haiyang Zhang 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 --- drivers/net/hyperv/netvsc_drv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index b8e23e257f00..718d126108f6 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -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;