5 files changed, 27 insertions, 20 deletions

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 3fae87559791..dd873cc41c2b 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -39,6 +39,7 @@
 #include <linux/bitops.h>
 #include <linux/workqueue.h>
 #include <linux/of.h>
+#include <linux/slab.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -391,11 +392,11 @@ static void emac_hash_mc(struct emac_instance *dev)
         struct dev_mc_list *dmi;
         int i;
 
-        DBG(dev, "hash_mc %d" NL, dev->ndev->mc_count);
+        DBG(dev, "hash_mc %d" NL, netdev_mc_count(dev->ndev));
 
         memset(gaht_temp, 0, sizeof (gaht_temp));
 
-        for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) {
+        netdev_for_each_mc_addr(dmi, dev->ndev) {
                 int slot, reg, mask;
                 DBG2(dev, "mc %pM" NL, dmi->dmi_addr);
 
@@ -425,9 +426,9 @@ static inline u32 emac_iff2rmr(struct net_device *ndev)
         if (ndev->flags & IFF_PROMISC)
                 r |= EMAC_RMR_PME;
         else if (ndev->flags & IFF_ALLMULTI ||
-                         (ndev->mc_count > EMAC_XAHT_SLOTS(dev)))
+                         (netdev_mc_count(ndev) > EMAC_XAHT_SLOTS(dev)))
                 r |= EMAC_RMR_PMME;
-        else if (ndev->mc_count > 0)
+        else if (!netdev_mc_empty(ndev))
                 r |= EMAC_RMR_MAE;
 
         return r;
@@ -1976,27 +1977,27 @@ static int emac_ethtool_set_settings(struct net_device *ndev,
         if (cmd->autoneg == AUTONEG_DISABLE) {
                 switch (cmd->speed) {
                 case SPEED_10:
-                        if (cmd->duplex == DUPLEX_HALF
-                            && !(f & SUPPORTED_10baseT_Half))
+                        if (cmd->duplex == DUPLEX_HALF &&
+                            !(f & SUPPORTED_10baseT_Half))
                                 return -EINVAL;
-                        if (cmd->duplex == DUPLEX_FULL
-                            && !(f & SUPPORTED_10baseT_Full))
+                        if (cmd->duplex == DUPLEX_FULL &&
+                            !(f & SUPPORTED_10baseT_Full))
                                 return -EINVAL;
                         break;
                 case SPEED_100:
-                        if (cmd->duplex == DUPLEX_HALF
-                            && !(f & SUPPORTED_100baseT_Half))
+                        if (cmd->duplex == DUPLEX_HALF &&
+                            !(f & SUPPORTED_100baseT_Half))
                                 return -EINVAL;
-                        if (cmd->duplex == DUPLEX_FULL
-                            && !(f & SUPPORTED_100baseT_Full))
+                        if (cmd->duplex == DUPLEX_FULL &&
+                            !(f & SUPPORTED_100baseT_Full))
                                 return -EINVAL;
                         break;
                 case SPEED_1000:
-                        if (cmd->duplex == DUPLEX_HALF
-                            && !(f & SUPPORTED_1000baseT_Half))
+                        if (cmd->duplex == DUPLEX_HALF &&
+                            !(f & SUPPORTED_1000baseT_Half))
                                 return -EINVAL;
-                        if (cmd->duplex == DUPLEX_FULL
-                            && !(f & SUPPORTED_1000baseT_Full))
+                        if (cmd->duplex == DUPLEX_FULL &&
+                            !(f & SUPPORTED_1000baseT_Full))
                                 return -EINVAL;
                         break;
                 default:
@@ -2149,9 +2150,12 @@ static int emac_ethtool_nway_reset(struct net_device *ndev)
         return res;
 }
 
-static int emac_ethtool_get_stats_count(struct net_device *ndev)
+static int emac_ethtool_get_sset_count(struct net_device *ndev, int stringset)
 {
-        return EMAC_ETHTOOL_STATS_COUNT;
+        if (stringset == ETH_SS_STATS)
+                return EMAC_ETHTOOL_STATS_COUNT;
+        else
+                return -EINVAL;
 }
 
 static void emac_ethtool_get_strings(struct net_device *ndev, u32 stringset,
@@ -2182,7 +2186,6 @@ static void emac_ethtool_get_drvinfo(struct net_device *ndev,
         info->fw_version[0] = '\0';
         sprintf(info->bus_info, "PPC 4xx EMAC-%d %s",
                 dev->cell_index, dev->ofdev->node->full_name);
-        info->n_stats = emac_ethtool_get_stats_count(ndev);
         info->regdump_len = emac_ethtool_get_regs_len(ndev);
 }
 
@@ -2202,7 +2205,7 @@ static const struct ethtool_ops emac_ethtool_ops = {
         .get_rx_csum = emac_ethtool_get_rx_csum,
 
         .get_strings = emac_ethtool_get_strings,
-        .get_stats_count = emac_ethtool_get_stats_count,
+        .get_sset_count = emac_ethtool_get_sset_count,
         .get_ethtool_stats = emac_ethtool_get_ethtool_stats,
 
         .get_link = ethtool_op_get_link,
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 18d56c6c4238..b1cbe6fdfc7a 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -34,6 +34,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
 #include <linux/of_platform.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/dcr.h>
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 2a2fc17b2878..5b3d94419fe6 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -26,6 +26,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "core.h"
 #include <asm/dcr-regs.h>
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index 8d76cb89dbd6..5b90d34c8455 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -21,6 +21,7 @@
  * option) any later version.
  *
  */
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <asm/io.h>
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 17b154124943..1f038f808ab3 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -21,6 +21,7 @@
  * option) any later version.
  *
  */
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/ethtool.h>
 #include <asm/io.h>