Commit 527bad77 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

netvsc: don't access netdev->num_rx_queues directly


[ Upstream commit b92b7d33 ]

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: ff4a4419 ("netvsc: allow get/set of RSS indirection table")
Fixes: 2b01888d ("netvsc: allow more flexible setting of number of channels")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72056dab
...@@ -753,7 +753,7 @@ static int netvsc_set_channels(struct net_device *net, ...@@ -753,7 +753,7 @@ static int netvsc_set_channels(struct net_device *net,
channels->rx_count || channels->tx_count || channels->other_count) channels->rx_count || channels->tx_count || channels->other_count)
return -EINVAL; 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; return -EINVAL;
if (net_device_ctx->start_remove || !nvdev || nvdev->destroy) if (net_device_ctx->start_remove || !nvdev || nvdev->destroy)
...@@ -1142,7 +1142,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir, ...@@ -1142,7 +1142,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir,
if (indir) { if (indir) {
for (i = 0; i < ITAB_NUM; i++) for (i = 0; i < ITAB_NUM; i++)
if (indir[i] >= dev->num_rx_queues) if (indir[i] >= VRSS_CHANNEL_MAX)
return -EINVAL; return -EINVAL;
for (i = 0; i < ITAB_NUM; i++) for (i = 0; i < ITAB_NUM; i++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment