2 files changed, 12 insertions, 17 deletions

diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ixp2000/enp2611.c
index b02a981c87a8..34a6cfd17930 100644
--- a/drivers/net/ixp2000/enp2611.c
+++ b/drivers/net/ixp2000/enp2611.c
@@ -119,24 +119,9 @@ static struct ixp2400_msf_parameters enp2611_msf_parameters =
         }
 };
 
-struct enp2611_ixpdev_priv
-{
-        struct ixpdev_priv              ixpdev_priv;
-        struct net_device_stats         stats;
-};
-
 static struct net_device *nds[3];
 static struct timer_list link_check_timer;
 
-static struct net_device_stats *enp2611_get_stats(struct net_device *dev)
-{
-        struct enp2611_ixpdev_priv *ip = netdev_priv(dev);
-
-        pm3386_get_stats(ip->ixpdev_priv.channel, &(ip->stats));
-
-        return &(ip->stats);
-}
-
 /* @@@ Poll the SFP moddef0 line too.  */
 /* @@@ Try to use the pm3386 DOOL interrupt as well.  */
 static void enp2611_check_link_status(unsigned long __dummy)
@@ -203,14 +188,13 @@ static int __init enp2611_init_module(void)
 
         ports = pm3386_port_count();
         for (i = 0; i < ports; i++) {
-                nds[i] = ixpdev_alloc(i, sizeof(struct enp2611_ixpdev_priv));
+                nds[i] = ixpdev_alloc(i, sizeof(struct ixpdev_priv));
                 if (nds[i] == NULL) {
                         while (--i >= 0)
                                 free_netdev(nds[i]);
                         return -ENOMEM;
                 }
 
-                nds[i]->get_stats = enp2611_get_stats;
                 pm3386_init_port(i);
                 pm3386_get_mac(i, nds[i]->dev_addr);
         }
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c
index 127243461a51..9aee0cc922c9 100644
--- a/drivers/net/ixp2000/ixpdev.c
+++ b/drivers/net/ixp2000/ixpdev.c
@@ -21,6 +21,7 @@
 #include "ixp2400_tx.ucode"
 #include "ixpdev_priv.h"
 #include "ixpdev.h"
+#include "pm3386.h"
 
 #define DRV_MODULE_VERSION      "0.2"
 
@@ -271,6 +272,15 @@ static int ixpdev_close(struct net_device *dev)
         return 0;
 }
 
+static struct net_device_stats *ixpdev_get_stats(struct net_device *dev)
+{
+        struct ixpdev_priv *ip = netdev_priv(dev);
+
+        pm3386_get_stats(ip->channel, &(dev->stats));
+
+        return &(dev->stats);
+}
+
 static const struct net_device_ops ixpdev_netdev_ops = {
         .ndo_open               = ixpdev_open,
         .ndo_stop               = ixpdev_close,
@@ -278,6 +288,7 @@ static const struct net_device_ops ixpdev_netdev_ops = {
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_get_stats          = ixpdev_get_stats,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = ixpdev_poll_controller,
 #endif