e1000e: cleanup several stats issues

Several stats registers are completely unused and we just waste pci
bus time reading them. We also omit using the high 32 bits of the GORC/
GOTC counters. We can just read clear them and only read the low registers.

Mii-tool can also break es2lan if it executes a MII PHY register
ioctl while the device is in autonegotiation. Unfortunately it seems
that several applications and installations still perform this ioctl
call periodically and especially in this crucial startup time. We
can fool the ioctl by providing fail safe information that mimics
the "down" link state and only perform the dangerous PHY reads once
after link comes up to fill in the real values. As long as link
stays up the information will not change.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 53f1ac6327fa..a930e6d9cf02 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -592,10 +592,8 @@ struct e1000_hw_stats {
         u64 bprc;
         u64 mprc;
         u64 gptc;
-        u64 gorcl;
-        u64 gorch;
-        u64 gotcl;
-        u64 gotch;
+        u64 gorc;
+        u64 gotc;
         u64 rnbc;
         u64 ruc;
         u64 rfc;
@@ -604,10 +602,8 @@ struct e1000_hw_stats {
         u64 mgprc;
         u64 mgpdc;
         u64 mgptc;
-        u64 torl;
-        u64 torh;
-        u64 totl;
-        u64 toth;
+        u64 tor;
+        u64 tot;
         u64 tpr;
         u64 tpt;
         u64 ptc64;