|
@@ -1221,7 +1221,6 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
|
|
struct ndis_recv_scale_cap rsscap;
|
|
struct ndis_recv_scale_cap rsscap;
|
|
u32 rsscap_size = sizeof(struct ndis_recv_scale_cap);
|
|
u32 rsscap_size = sizeof(struct ndis_recv_scale_cap);
|
|
u32 mtu, size;
|
|
u32 mtu, size;
|
|
- const struct cpumask *node_cpu_mask;
|
|
|
|
u32 num_possible_rss_qs;
|
|
u32 num_possible_rss_qs;
|
|
int i, ret;
|
|
int i, ret;
|
|
|
|
|
|
@@ -1290,14 +1289,8 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
|
|
if (ret || rsscap.num_recv_que < 2)
|
|
if (ret || rsscap.num_recv_que < 2)
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
- /*
|
|
|
|
- * We will limit the VRSS channels to the number CPUs in the NUMA node
|
|
|
|
- * the primary channel is currently bound to.
|
|
|
|
- *
|
|
|
|
- * This also guarantees that num_possible_rss_qs <= num_online_cpus
|
|
|
|
- */
|
|
|
|
- node_cpu_mask = cpumask_of_node(cpu_to_node(dev->channel->target_cpu));
|
|
|
|
- num_possible_rss_qs = min_t(u32, cpumask_weight(node_cpu_mask),
|
|
|
|
|
|
+ /* This guarantees that num_possible_rss_qs <= num_online_cpus */
|
|
|
|
+ num_possible_rss_qs = min_t(u32, num_online_cpus(),
|
|
rsscap.num_recv_que);
|
|
rsscap.num_recv_que);
|
|
|
|
|
|
net_device->max_chn = min_t(u32, VRSS_CHANNEL_MAX, num_possible_rss_qs);
|
|
net_device->max_chn = min_t(u32, VRSS_CHANNEL_MAX, num_possible_rss_qs);
|