3 files changed, 20 insertions, 1 deletions

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 384ca4f4de4a..4815843a6019 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -634,6 +634,7 @@ struct netvsc_device {
 
         struct vmbus_channel *chn_table[NR_CPUS];
         u32 send_table[VRSS_SEND_TAB_SIZE];
+        u32 max_chn;
         u32 num_chn;
         atomic_t queue_sends[NR_CPUS];
 
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 15d82eda0baf..a06bd6614007 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -687,6 +687,19 @@ static void netvsc_get_drvinfo(struct net_device *net,
         strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
 }
 
+static void netvsc_get_channels(struct net_device *net,
+                                struct ethtool_channels *channel)
+{
+        struct net_device_context *net_device_ctx = netdev_priv(net);
+        struct hv_device *dev = net_device_ctx->device_ctx;
+        struct netvsc_device *nvdev = hv_get_drvdata(dev);
+
+        if (nvdev) {
+                channel->max_combined   = nvdev->max_chn;
+                channel->combined_count = nvdev->num_chn;
+        }
+}
+
 static int netvsc_change_mtu(struct net_device *ndev, int mtu)
 {
         struct net_device_context *ndevctx = netdev_priv(ndev);
@@ -760,6 +773,7 @@ static void netvsc_poll_controller(struct net_device *net)
 static const struct ethtool_ops ethtool_ops = {
         .get_drvinfo    = netvsc_get_drvinfo,
         .get_link       = ethtool_op_get_link,
+        .get_channels   = netvsc_get_channels,
 };
 
 static const struct net_device_ops device_ops = {
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 7816d98bdddc..ca81de04bc76 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -1027,6 +1027,7 @@ int rndis_filter_device_add(struct hv_device *dev,
 
         /* Initialize the rndis device */
         net_device = hv_get_drvdata(dev);
+        net_device->max_chn = 1;
         net_device->num_chn = 1;
 
         net_device->extension = rndis_device;
@@ -1094,6 +1095,7 @@ int rndis_filter_device_add(struct hv_device *dev,
         if (ret || rsscap.num_recv_que < 2)
                 goto out;
 
+        net_device->max_chn = rsscap.num_recv_que;
         net_device->num_chn = (num_online_cpus() < rsscap.num_recv_que) ?
                                num_online_cpus() : rsscap.num_recv_que;
         if (net_device->num_chn == 1)
@@ -1140,8 +1142,10 @@ int rndis_filter_device_add(struct hv_device *dev,
         ret = rndis_filter_set_rss_param(rndis_device, net_device->num_chn);
 
 out:
-        if (ret)
+        if (ret) {
+                net_device->max_chn = 1;
                 net_device->num_chn = 1;
+        }
         return 0; /* return 0 because primary channel can be used alone */
 
 err_dev_remv: