From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:55088 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751294AbdGQQwZ (ORCPT ); Mon, 17 Jul 2017 12:52:25 -0400 Subject: Patch "netvsc: don't access netdev->num_rx_queues directly" has been added to the 4.11-stable tree To: arnd@arndb.de, davem@davemloft.net, gregkh@linuxfoundation.org, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: , From: Date: Mon, 17 Jul 2017 18:51:59 +0200 Message-ID: <150031031991231@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled netvsc: don't access netdev->num_rx_queues directly to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: netvsc-don-t-access-netdev-num_rx_queues-directly.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Mon Jul 17 18:47:09 CEST 2017 From: Arnd Bergmann Date: Thu, 22 Jun 2017 00:16:37 +0200 Subject: netvsc: don't access netdev->num_rx_queues directly From: Arnd Bergmann [ Upstream commit b92b7d3312033a08cae2c879b9243c42ad7de94b ] 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 Reviewed-by: Haiyang Zhang Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/hyperv/netvsc_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -753,7 +753,7 @@ static int netvsc_set_channels(struct ne 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 (net_device_ctx->start_remove || !nvdev || nvdev->destroy) @@ -1142,7 +1142,7 @@ static int netvsc_set_rxfh(struct net_de 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++) Patches currently in stable-queue which might be from arnd@arndb.de are queue-4.11/netvsc-don-t-access-netdev-num_rx_queues-directly.patch