From patchwork Wed Jun 21 22:16:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106139 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp2158538qgd; Wed, 21 Jun 2017 15:17:34 -0700 (PDT) X-Received: by 10.84.173.67 with SMTP id o61mr35375148plb.236.1498083454224; Wed, 21 Jun 2017 15:17:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498083454; cv=none; d=google.com; s=arc-20160816; b=0jgVl9wKFXGix9Pr1E4uQHJ6LQ2M4ri/0UxaU7g+UaxLF0KtLwgZ4Ne7iDDWnxYsTt P5IUly0Oe9JV9mWX9z7zFyTNbPhsI3Nau2M4kjnPPkYHzgTMLyiayyMd5yuSjYAi6BuS RRrZtNpXf/PWZpoDD2PZczF0ktqxAG5jhwLgtjFh84EWQHne3I9o2fzU+Or/gb9Anvck 29SJRY0QMKgf8S+Z/yHe5fda4DbZ7jnPZPYW8gVrABVvA51azXawDgsqoIlpNlzXGDYt 63gMryPYo8NKbhXuNUAwg+tpLmuULbd/+T3+JhBuvTy/syy+hKSxuonXQxN8SddUhikS +rPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=wC5Un7ZYPsXRYfbphIW4zL/W/1kJ7FYCyIO6pEmodmk=; b=0oez4Yt1Fa8NZ2BHdxEmzi60ouEzmXQqYhhJcS2ljyDLWvVr4Brgw0L7dPdDXFi9To efXgG4GGCpAkvnSnlIIhvwayZyTXUP/ChnTOxr8LWO3D+9EfT6qRCDIPocXjELaFMZvm XylRi9iWNg+mo8kMhb6FSdBpVY3josJJTpnXt17QOPy4APIOxDqI9C8oAbrY4rATEdoP OLHpHElriSuKqRcOnVI5TTchu7z7oPN/goBikO2tRuy/Q6z/PrmVxDuGfy7BcEt09kLs 2TWuYU3f3OnmoF1BmQj9xtFBamUrWuQStK3OfitCSQSmFHvY70BhoACBQSU1szdL4OQP XcEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l5si14205467pgk.314.2017.06.21.15.17.33; Wed, 21 Jun 2017 15:17:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbdFUWRc (ORCPT + 25 others); Wed, 21 Jun 2017 18:17:32 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:50092 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751755AbdFUWRa (ORCPT ); Wed, 21 Jun 2017 18:17:30 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MUxEy-1dICH41Z88-00YC9Y; Thu, 22 Jun 2017 00:17:18 +0200 From: Arnd Bergmann To: Stephen Hemminger Cc: Arnd Bergmann , "K. Y. Srinivasan" , Haiyang Zhang , "David S. Miller" , Simon Xiao , devel@linuxdriverproject.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netvsc: don't access netdev->num_rx_queues directly Date: Thu, 22 Jun 2017 00:16:37 +0200 Message-Id: <20170621221714.278724-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:LSEQ/lNlCmESJS5fF3lTHT+weZTRMP6tqEne20kQ3FdEyyGl8Ut nV+h4i/3Y18M6bsuzwncFJGIMioKY+lDXNoJP1BvmPariCq9QuNDGP+xxVy2MJeyhL/t9cA 0icgtzgVbm0i+C09l5VvBF2Ekg/Tfo34ul4Prc/PG2P8MHWnz86v2nMV81192Qd71woKbfQ nHEZ/mL/X4t63BLejWqBg== X-UI-Out-Filterresults: notjunk:1; V01:K0:aHMwvpbfkSA=:lJn6vWw2mz/cfzZ5ekfgS5 AYldIvZR13T6vPJb78zQuvF18ly6yfDxJQutBaEFlytFIbiOkm+iGT8Ms7l8E+ke7Y4aXCJaC ko73Jd0jH6QXPk6qw6x+vDA507bpzv5CGLVN+tSDNFrKK1lq+kSITYEhStr/yXgybt8mSh8M9 Cc7C3wIO9fPZNQiVA8VWS8rvYklbRLSS5NHNNGxrQqBK3jmH+yt33HG91w6AFhb4y2ejeY1lg eWenW1c+iKSJmwc0hWUBwwl6igA5bP8toZRnT1TNO1p7upso6b+EbCiyo6M9ai7PVHHCnpEFa 0Tu1meQB847MwE60VRL3mhZyQ9BcSeoNB64A5soc0qvRZkfYqCGyrRg5csmr1PvNMyddePLQN apO4MZ2R9B+t50MX99/Mh655rEavpNQrQ471eJDTpCi7AGaVUvN/3jxhlIw3Ub+B4rvywB4A+ vt3FrShfnMpBG0WKmcrKe6BizrLhyPMYt/zZeaM1+wbv4FkA63GeIpv5y8w9338EFIigVbusL NRelrRZ7nKdQEC1jE54DrwZZgs/iw5dbgJzXFI/bTQKsFo7jnXRrMsWfkzz80UM1m5h+hvMYu 56tYdtVhxOl6SihlDEzzn4eSv2OhPRHZ4x7dSVDE4oCK38bU3gfUWPku9gSjquypO3K2Z+66m OYJA9tzFFPYAa581p9dc9VHHAp4DQmRWJ0vSbq/qiuvasE72x8/choLUsYkQ7EZ+NZPM= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This structure member is hidden behind CONFIG_SYSFS, and we get a build error when that is disabled: drivers/net/hyperv/netvsc_drv.c: In function 'netvsc_set_channels': drivers/net/hyperv/netvsc_drv.c:754:49: error: 'struct net_device' has no member named 'num_rx_queues'; did you mean 'num_tx_queues'? drivers/net/hyperv/netvsc_drv.c: In function 'netvsc_set_rxfh': drivers/net/hyperv/netvsc_drv.c:1181:25: error: 'struct net_device' has no member named 'num_rx_queues'; did you mean 'num_tx_queues'? As the value is only set once to the argument of alloc_netdev_mq(), we can compare against that constant directly. Fixes: ff4a44199012 ("netvsc: allow get/set of RSS indirection table") Fixes: 2b01888d1b45 ("netvsc: allow more flexible setting of number of channels") Signed-off-by: Arnd Bergmann --- drivers/net/hyperv/netvsc_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Signed-off-by: Stephen Hemminger diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 9a6c5864bc04..a284bfe991ba 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -751,7 +751,7 @@ 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 > net->num_rx_queues) + if (count > net->num_tx_queues || count > VRSS_CHANNEL_MAX) return -EINVAL; if (!nvdev || nvdev->destroy) @@ -1178,7 +1178,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir, rndis_dev = ndev->extension; if (indir) { for (i = 0; i < ITAB_NUM; i++) - if (indir[i] >= dev->num_rx_queues) + if (indir[i] >= VRSS_CHANNEL_MAX) return -EINVAL; for (i = 0; i < ITAB_NUM; i++)