From 9d85a6bf85d08dfce5b732d5e9e388916986035b Mon Sep 17 00:00:00 2001
From: Mark Einon <Mark.Einon@gmail.com>
Date: Mon, 6 Jun 2011 19:07:00 +0100
Subject: [PATCH] --- yaml --- r: 259583 b: refs/heads/master c:
 47883130a049be2d55c3a8080a71e73d4b939ef8 h: refs/heads/master i:   259581:
 61c5f0654199648c14548d9b40e8f502db79b518   259579:
 e194299aff11bd1438a0d1456988c89557e36ce5   259575:
 3d4bc1e389f8cab529508f0e3d690094996134f2   259567:
 62749343703b9c6a8c02d3dff072d3049df00469   259551:
 579dfa936b10f2d97ba31f2f4689420c8bbdc2ea   259519:
 c2c38a89bb640e9ab006bb492cb25840fed4ce3f   259455:
 b68c309c7bec3b865b861257436f40eaafd96a2a   259327:
 b163d0e2bd0d3e5c8f7674b5b77524ec00828895   259071:
 7ea23c9bcc745b1b74d1dc0fd85bc5d4d694b719 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/et131x/et1310_mac.c     | 2 +-
 trunk/drivers/staging/et131x/et131x_adapter.h | 8 ++++----
 trunk/drivers/staging/et131x/et131x_netdev.c  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a5add7a21fb3..38e561f7f38d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29667f30b2aac0e195a5dbc2ca05004caf7c8117
+refs/heads/master: 47883130a049be2d55c3a8080a71e73d4b939ef8
diff --git a/trunk/drivers/staging/et131x/et1310_mac.c b/trunk/drivers/staging/et131x/et1310_mac.c
index c634e358b003..1425af222ab5 100644
--- a/trunk/drivers/staging/et131x/et1310_mac.c
+++ b/trunk/drivers/staging/et131x/et1310_mac.c
@@ -452,7 +452,7 @@ void ConfigFlowControl(struct et131x_adapter *etdev)
  */
 void UpdateMacStatHostCounters(struct et131x_adapter *etdev)
 {
-	struct _ce_stats_t *stats = &etdev->Stats;
+	struct ce_stats_t *stats = &etdev->Stats;
 	struct macstat_regs __iomem *macstat =
 		&etdev->regs->macstat;
 
diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h
index c9a119e1d866..87905e75c028 100644
--- a/trunk/drivers/staging/et131x/et131x_adapter.h
+++ b/trunk/drivers/staging/et131x/et131x_adapter.h
@@ -67,7 +67,7 @@
  * Do not change these values: if changed, then change also in respective
  * TXdma and Rxdma engines
  */
-#define NUM_DESC_PER_RING_TX         512	/* TX Do not change these values */
+#define NUM_DESC_PER_RING_TX         512    /* TX Do not change these values */
 #define NUM_TCB                      64
 
 /*
@@ -98,7 +98,7 @@ struct rfd {
 #define FLOW_NONE	3
 
 /* Struct to define some device statistics */
-typedef struct _ce_stats_t {
+struct ce_stats_t {
 	/* Link Input/Output stats */
 	uint64_t ipackets;	/* # of in packets */
 	uint64_t opackets;	/* # of out packets */
@@ -143,7 +143,7 @@ typedef struct _ce_stats_t {
 
 	u32 SynchrounousIterations;
 	u32 InterruptStatus;
-} CE_STATS_t, *PCE_STATS_t;
+};
 
 
 /* The private adapter structure */
@@ -239,7 +239,7 @@ struct et131x_adapter {
 	u8 ReplicaPhyLoopbkPF;	/* Replica Enable Pass/Fail */
 
 	/* Stats */
-	CE_STATS_t Stats;
+	struct ce_stats_t Stats;
 
 	struct net_device_stats net_stats;
 	struct net_device_stats net_stats_prev;
diff --git a/trunk/drivers/staging/et131x/et131x_netdev.c b/trunk/drivers/staging/et131x/et131x_netdev.c
index b25bae29042e..5f6522cca4aa 100644
--- a/trunk/drivers/staging/et131x/et131x_netdev.c
+++ b/trunk/drivers/staging/et131x/et131x_netdev.c
@@ -161,7 +161,7 @@ struct net_device_stats *et131x_stats(struct net_device *netdev)
 {
 	struct et131x_adapter *adapter = netdev_priv(netdev);
 	struct net_device_stats *stats = &adapter->net_stats;
-	CE_STATS_t *devstat = &adapter->Stats;
+	struct ce_stats_t *devstat = &adapter->Stats;
 
 	stats->rx_packets = devstat->ipackets;
 	stats->tx_packets = devstat->opackets;