diff options
| author | Andrew Schwartzmeyer | 2015-08-12 02:14:31 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-08-12 23:45:38 +0200 |
| commit | 8ebdcc52b9b8a53e3ba2643f515d41fff44d4743 (patch) | |
| tree | b9d83ff663e11cb4c38199b4e4fa8d4d668b9de0 /drivers/net/hyperv/rndis_filter.c | |
| parent | lan78xx: Remove BUG_ON() (diff) | |
| download | kernel-qcow2-linux-8ebdcc52b9b8a53e3ba2643f515d41fff44d4743.tar.gz kernel-qcow2-linux-8ebdcc52b9b8a53e3ba2643f515d41fff44d4743.tar.xz kernel-qcow2-linux-8ebdcc52b9b8a53e3ba2643f515d41fff44d4743.zip | |
hv_netvsc: Set vRSS with num_chn in RNDIS filter
Uses device_info->num_chn to pass user provided number of vRSS
queues (from ethtool --set-channels) to rndis_filter_device_add. If
nonzero and less than the maximum, set net_device->num_chn to the given
value; else default to prior algorithm.
Always initialize struct device_info to 0, otherwise not all its fields
are guaranteed to be 0, which is necessary when checking if num_chn has
been purposefully set.
Signed-off-by: Andrew Schwartzmeyer <andschwa@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/rndis_filter.c')
| -rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index 9b8263db49cc..5931a799aa17 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c @@ -1125,7 +1125,12 @@ int rndis_filter_device_add(struct hv_device *dev, */ node_cpu_mask = cpumask_of_node(cpu_to_node(dev->channel->target_cpu)); num_possible_rss_qs = cpumask_weight(node_cpu_mask); - net_device->num_chn = min(num_possible_rss_qs, num_rss_qs); + + /* We will use the given number of channels if available. */ + if (device_info->num_chn && device_info->num_chn < net_device->max_chn) + net_device->num_chn = device_info->num_chn; + else + net_device->num_chn = min(num_possible_rss_qs, num_rss_qs); num_rss_qs = net_device->num_chn - 1; net_device->num_sc_offered = num_rss_qs; |