2 files changed, 10 insertions, 4 deletions

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index f6f961fefbe5..b33f316bb92e 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -61,6 +61,13 @@ struct ethtool_drvinfo {
                                 /* For PCI devices, use pci_name(pci_dev). */
         char    reserved1[32];
         char    reserved2[12];
+                                /*
+                                 * Some struct members below are filled in
+                                 * using ops->get_sset_count().  Obtaining
+                                 * this info from ethtool_drvinfo is now
+                                 * deprecated; Use ETHTOOL_GSSET_INFO
+                                 * instead.
+                                 */
         __u32   n_priv_flags;   /* number of flags valid in ETHTOOL_GPFLAGS */
         __u32   n_stats;        /* number of u64's from ETHTOOL_GSTATS */
         __u32   testinfo_len;
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 70075c47ada8..33d2ded50f84 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -17,6 +17,7 @@
 #include <linux/errno.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 
 /*
@@ -216,7 +217,7 @@ static noinline int ethtool_get_drvinfo(struct net_device *dev, void __user *use
 
         /*
          * this method of obtaining string set info is deprecated;
-         * consider using ETHTOOL_GSSET_INFO instead
+         * Use ETHTOOL_GSSET_INFO instead.
          */
         if (ops->get_sset_count) {
                 int rc;
@@ -265,9 +266,7 @@ static noinline int ethtool_get_sset_info(struct net_device *dev,
                 return 0;
 
         /* calculate size of return buffer */
-        for (i = 0; i < 64; i++)
-                if (sset_mask & (1ULL << i))
-                        n_bits++;
+        n_bits = hweight64(sset_mask);
 
         memset(&info, 0, sizeof(info));
         info.cmd = ETHTOOL_GSSET_INFO;