i40e/i40evf: remove rx_errors and rx_missed

The rx_errors (GLV_REPC) and rx_missed (GLV_RMPC) were removed
from the chip design.

Change-ID: Ifdeb69c90feac64ec95c36d3d32c75e3a06de3b7
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index 1aaec400b28ecb3120b7236a516b13fb59f160b9..1bd0adb3873551e61f2e6cca9cc3b064c71ed0e6 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -862,12 +862,11 @@ static void i40e_dbg_dump_eth_stats(struct i40e_pf *pf,
                 "    rx_bytes = \t%lld \trx_unicast = \t\t%lld \trx_multicast = \t%lld\n",
                estats->rx_bytes, estats->rx_unicast, estats->rx_multicast);
        dev_info(&pf->pdev->dev,
-                "    rx_broadcast = \t%lld \trx_discards = \t\t%lld \trx_errors = \t%lld\n",
-                estats->rx_broadcast, estats->rx_discards, estats->rx_errors);
+                "    rx_broadcast = \t%lld \trx_discards = \t\t%lld\n",
+                estats->rx_broadcast, estats->rx_discards);
        dev_info(&pf->pdev->dev,
-                "    rx_missed = \t%lld \trx_unknown_protocol = \t%lld \ttx_bytes = \t%lld\n",
-                estats->rx_missed, estats->rx_unknown_protocol,
-                estats->tx_bytes);
+                "    rx_unknown_protocol = \t%lld \ttx_bytes = \t%lld\n",
+                estats->rx_unknown_protocol, estats->tx_bytes);
        dev_info(&pf->pdev->dev,
                 "    tx_unicast = \t%lld \ttx_multicast = \t\t%lld \ttx_broadcast = \t%lld\n",
                 estats->tx_unicast, estats->tx_multicast, estats->tx_broadcast);

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 354181d1761226136b15f4a41080127c4b8f4494..e23d514ae93b7516c5feb2ea2d31142b828cbec5 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -78,7 +78,6 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
 static struct i40e_stats i40e_gstrings_stats[] = {
        I40E_PF_STAT("rx_bytes", stats.eth.rx_bytes),
        I40E_PF_STAT("tx_bytes", stats.eth.tx_bytes),
-       I40E_PF_STAT("rx_errors", stats.eth.rx_errors),
        I40E_PF_STAT("tx_errors", stats.eth.tx_errors),
        I40E_PF_STAT("rx_dropped", stats.eth.rx_discards),
        I40E_PF_STAT("tx_dropped", stats.eth.tx_discards),

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index e340e3ba240a814d70a8478a77ca6861e523853d..76bd168c63eed55c83a4a0f5dd0ceef58a2c09ef 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -803,8 +803,6 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi)
 
        /* update netdev stats from eth stats */
        i40e_update_eth_stats(vsi);
-       ons->rx_errors = oes->rx_errors;
-       ns->rx_errors = es->rx_errors;
        ons->tx_errors = oes->tx_errors;
        ns->tx_errors = es->tx_errors;
        ons->multicast = oes->rx_multicast;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 02e8f9a40b8d55f7fa6975045f4b2813839eb3ed..5a930b31728fc2235705c4838b8f75b5b4b9194b 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -972,8 +972,6 @@ struct i40e_eth_stats {
        u64 rx_multicast;               /* mprc */
        u64 rx_broadcast;               /* bprc */
        u64 rx_discards;                /* rdpc */
-       u64 rx_errors;                  /* repc */
-       u64 rx_missed;                  /* rmpc */
        u64 rx_unknown_protocol;        /* rupp */
        u64 tx_bytes;                   /* gotc */
        u64 tx_unicast;                 /* uptc */

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index eb2e9f3180841c44b96c0af22a6aa16230e6c126..4fc9835ca7b1eae86a18f7faf80e1825e13ab9cb 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -972,8 +972,6 @@ struct i40e_eth_stats {
        u64 rx_multicast;               /* mprc */
        u64 rx_broadcast;               /* bprc */
        u64 rx_discards;                /* rdpc */
-       u64 rx_errors;                  /* repc */
-       u64 rx_missed;                  /* rmpc */
        u64 rx_unknown_protocol;        /* rupp */
        u64 tx_bytes;                   /* gotc */
        u64 tx_unicast;                 /* uptc */

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
index 8d41a88f1666cab03b1f300704d18b613169fec6..60407a9df0c1ef5103b4e0f198f556b229a9417a 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
@@ -47,8 +47,6 @@ static const struct i40evf_stats i40evf_gstrings_stats[] = {
        I40EVF_STAT("rx_multicast", current_stats.rx_multicast),
        I40EVF_STAT("rx_broadcast", current_stats.rx_broadcast),
        I40EVF_STAT("rx_discards", current_stats.rx_discards),
-       I40EVF_STAT("rx_errors", current_stats.rx_errors),
-       I40EVF_STAT("rx_missed", current_stats.rx_missed),
        I40EVF_STAT("rx_unknown_protocol", current_stats.rx_unknown_protocol),
        I40EVF_STAT("tx_bytes", current_stats.tx_bytes),
        I40EVF_STAT("tx_unicast", current_stats.tx_unicast),

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index 7f80bb4177225af7a026a59cd52e3ebe488b6a41..b3cd3cd644a1563cfd806d15a5d0a8b622d0dade 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -748,9 +748,8 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                                                 stats->tx_broadcast;
                adapter->net_stats.rx_bytes = stats->rx_bytes;
                adapter->net_stats.tx_bytes = stats->tx_bytes;
-               adapter->net_stats.rx_errors = stats->rx_errors;
                adapter->net_stats.tx_errors = stats->tx_errors;
-               adapter->net_stats.rx_dropped = stats->rx_missed;
+               adapter->net_stats.rx_dropped = stats->rx_discards;
                adapter->net_stats.tx_dropped = stats->tx_discards;
                adapter->current_stats = *stats;
                }