igc: Clean up the hw_stats structure

Remove ictxptc, ictxatc, cbtmpc, cbrdpc, cbrmpc and htcbdpc fields from
the hw_stats structure. Accordance to the i225 device
specification these fields not in use.
This patch come to clean up the driver code.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_hw.h b/drivers/net/ethernet/intel/igc/igc_hw.h
index 4b3d0b0f917be8febf52f002155c9802bfd7a6a9..b9fe51b91c473b36334fbd9785398d20e3143987 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_hw.h
+++ b/drivers/net/ethernet/intel/igc/igc_hw.h
@@ -268,15 +268,9 @@ struct igc_hw_stats {
        u64 tsctc;
        u64 tsctfc;
        u64 iac;
-       u64 ictxptc;
-       u64 ictxatc;
-       u64 cbtmpc;
        u64 htdpmc;
-       u64 cbrdpc;
-       u64 cbrmpc;
        u64 rpthc;
        u64 hgptc;
-       u64 htcbdpc;
        u64 hgorc;
        u64 hgotc;
        u64 lenerrs;

diff --git a/drivers/net/ethernet/intel/igc/igc_mac.c b/drivers/net/ethernet/intel/igc/igc_mac.c
index 02bbb8ac4f6825695fe8b28ea836eb827924f711..674b8ad21feadaecd36c14da93b7695b048d8d30 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_mac.c
+++ b/drivers/net/ethernet/intel/igc/igc_mac.c
@@ -296,9 +296,6 @@ void igc_clear_hw_cntrs_base(struct igc_hw *hw)
 
        rd32(IGC_IAC);
 
-       rd32(IGC_ICTXPTC);
-       rd32(IGC_ICTXATC);
-
        rd32(IGC_RPTHC);
        rd32(IGC_TLPIC);
        rd32(IGC_RLPIC);

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index d91fa4c06f2e66cb3af5d056b68f99743409809b..7a6f2a0d413ff3004972c536c07049880c4216fb 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -3730,8 +3730,6 @@ void igc_update_stats(struct igc_adapter *adapter)
        adapter->stats.tsctc += rd32(IGC_TSCTC);
 
        adapter->stats.iac += rd32(IGC_IAC);
-       adapter->stats.ictxptc += rd32(IGC_ICTXPTC);
-       adapter->stats.ictxatc += rd32(IGC_ICTXATC);
 
        /* Fill out the OS statistics structure */
        net_stats->multicast = adapter->stats.mprc;

diff --git a/drivers/net/ethernet/intel/igc/igc_regs.h b/drivers/net/ethernet/intel/igc/igc_regs.h
index 5ff3316717c73cb96d590b2a6b8dd2fd177bb5d3..b52dd9d737e8706b50194548aee177a8f638a895 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_regs.h
+++ b/drivers/net/ethernet/intel/igc/igc_regs.h
@@ -172,8 +172,6 @@
 #define IGC_BPTC       0x040F4  /* Broadcast Packets Tx Count - R/clr */
 #define IGC_TSCTC      0x040F8  /* TCP Segmentation Context Tx - R/clr */
 #define IGC_IAC                0x04100  /* Interrupt Assertion Count */
-#define IGC_ICTXPTC    0x0410C  /* Interrupt Cause Tx Pkt Timer Expire Count */
-#define IGC_ICTXATC    0x04110  /* Interrupt Cause Tx Abs Timer Expire Count */
 #define IGC_RPTHC      0x04104  /* Rx Packets To Host */
 #define IGC_TLPIC      0x04148  /* EEE Tx LPI Count */
 #define IGC_RLPIC      0x0414C  /* EEE Rx LPI Count */