Merge with 2.4.0-test4-pre2.

4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/pcmcia/netwave_cs.c b/drivers/net/pcmcia/netwave_cs.c
index 8cfbb96b5..a17ac13ae 100644
--- a/drivers/net/pcmcia/netwave_cs.c
+++ b/drivers/net/pcmcia/netwave_cs.c
@@ -235,7 +235,7 @@ static void netwave_watchdog(u_long);	/* Transmission watchdog */
 
 /* Statistics */
 static void update_stats(struct net_device *dev);
-static struct enet_statistics *netwave_get_stats(struct net_device *dev);
+static struct net_device_stats *netwave_get_stats(struct net_device *dev);
 
 /* Wireless extensions */
 #ifdef WIRELESS_EXT
@@ -312,14 +312,14 @@ typedef struct netwave_private {
     spinlock_t lock;
     struct timer_list      watchdog;	/* To avoid blocking state */
     struct site_survey     nss;
-    struct enet_statistics stats;
+    struct net_device_stats stats;
 #ifdef WIRELESS_EXT
     struct iw_statistics   iw_stats;    /* Wireless stats */
 #endif
 } netwave_private;
 
 #ifdef NETWAVE_STATS
-static struct enet_statistics *netwave_get_stats(struct net_device *dev);
+static struct net_device_stats *netwave_get_stats(struct net_device *dev);
 #endif
 
 /*
@@ -1434,7 +1434,7 @@ static void netwave_watchdog(u_long a) {
 	
 } /* netwave_watchdog */
 
-static struct enet_statistics *netwave_get_stats(struct net_device *dev) {
+static struct net_device_stats *netwave_get_stats(struct net_device *dev) {
     netwave_private *priv = (netwave_private*)dev->priv;
 
     update_stats(dev);
diff --git a/drivers/net/pcmcia/ray_cs.c b/drivers/net/pcmcia/ray_cs.c
index 452b9e7ed..0408612e6 100644
--- a/drivers/net/pcmcia/ray_cs.c
+++ b/drivers/net/pcmcia/ray_cs.c
@@ -94,7 +94,7 @@ static void ray_detach(dev_link_t *);
 /***** Prototypes indicated by device structure ******************************/
 static int ray_dev_close(struct net_device *dev);
 static int ray_dev_config(struct net_device *dev, struct ifmap *map);
-static struct enet_statistics *ray_get_stats(struct net_device *dev);
+static struct net_device_stats *ray_get_stats(struct net_device *dev);
 static int ray_dev_init(struct net_device *dev);
 static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
 static int ray_open(struct net_device *dev);
@@ -1679,13 +1679,13 @@ static int parse_addr(char *in_str, UCHAR *out)
     return status;
 }
 /*===========================================================================*/
-static struct enet_statistics *ray_get_stats(struct net_device *dev)
+static struct net_device_stats *ray_get_stats(struct net_device *dev)
 {
     ray_dev_t *local = (ray_dev_t *)dev->priv;
     dev_link_t *link = local->finder;
     struct status *p = (struct status *)(local->sram + STATUS_BASE);
     if (!(link->state & DEV_PRESENT)) {
-        DEBUG(2,"ray_cs enet_statistics - device not present\n");
+        DEBUG(2,"ray_cs net_device_stats - device not present\n");
         return &local->stats;
     }
     if (readb(&p->mrx_overflow_for_host))
diff --git a/drivers/net/pcmcia/ray_cs.h b/drivers/net/pcmcia/ray_cs.h
index 6f6f8e6ca..830dd2268 100644
--- a/drivers/net/pcmcia/ray_cs.h
+++ b/drivers/net/pcmcia/ray_cs.h
@@ -50,7 +50,7 @@ typedef struct ray_dev_t {
     UCHAR auth_id[6];
     UCHAR net_default_tx_rate;
     UCHAR encryption;
-    struct enet_statistics stats;
+    struct net_device_stats stats;
 
     UCHAR net_type;
     UCHAR sta_type;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 0ed5b4317..289d1bccc 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -398,7 +398,7 @@ typedef struct local_info_t {
     dev_link_t link;
     struct net_device dev;
     dev_node_t node;
-    struct enet_statistics stats;
+    struct net_device_stats stats;
     int card_type;
     int probe_port;
     int silicon; /* silicon revision. 0=old CE2, 1=Scipper, 4=Mohawk */
@@ -416,7 +416,7 @@ typedef struct local_info_t {
  */
 static int do_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static void do_tx_timeout(struct net_device *dev);
-static struct enet_statistics *do_get_stats(struct net_device *dev);
+static struct net_device_stats *do_get_stats(struct net_device *dev);
 static void set_addresses(struct net_device *dev);
 static void set_multicast_list(struct net_device *dev);
 static int set_card_type(dev_link_t *link, const void *s);
@@ -1648,7 +1648,7 @@ do_start_xmit(struct sk_buff *skb, struct net_device *dev)
     return 0;
 }
 
-static struct enet_statistics *
+static struct net_device_stats *
 do_get_stats(struct net_device *dev)
 {
     local_info_t *lp = dev->priv;