From 684641aecf8142bf2fba7a69af78cb420053e14f Mon Sep 17 00:00:00 2001 From: Bogdan Hamciuc Date: Fri, 19 Oct 2012 21:35:45 +0300 Subject: dpaa_eth: Remove unused ingress_calls field. There is already the percpu_priv_s->stats->rx_packets field, no need for the extra ingress_calls. Change-Id: If19f4363f710fb4a41369cf9214f5dede7c2c205 Signed-off-by: Bogdan Hamciuc (cherry picked from commit 74a790a00f71f34e1a4425c4a5a843ba57d2103f) Reviewed-on: http://git.am.freescale.net:8181/1047 Reviewed-by: Fleming Andrew-AFLEMING Tested-by: Fleming Andrew-AFLEMING diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c index 0d23bfb..f0bb3e3 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c @@ -2126,8 +2126,6 @@ ingress_rx_default_dqrr(struct qman_portal *portal, return qman_cb_dqrr_stop; } - prefetchw(&percpu_priv->ingress_calls); - /* Vale of plenty: make sure we didn't run out of buffers */ dpaa_eth_refill_bpools(percpu_priv); _dpa_rx(net_dev, priv, percpu_priv, &dq->fd, fq->fqid); @@ -2990,7 +2988,7 @@ static int __cold dpa_debugfs_show(struct seq_file *file, void *offset) dpa_bp_count = *percpu_priv->dpa_bp_count; total.in_interrupt += percpu_priv->in_interrupt; - total.ingress_calls += percpu_priv->stats.rx_packets; + total.stats.rx_packets += percpu_priv->stats.rx_packets; total.stats.tx_packets += percpu_priv->stats.tx_packets; total.tx_returned += percpu_priv->tx_returned; total.tx_confirm += percpu_priv->tx_confirm; @@ -3014,10 +3012,10 @@ static int __cold dpa_debugfs_show(struct seq_file *file, void *offset) percpu_priv->l4_hxs_errors, dpa_bp_count); } - seq_printf(file, "Total %8u %8u %8lu %8u %8u %8u %8lu %8lu" \ + seq_printf(file, "Total %8u %8lu %8lu %8u %8u %8u %8lu %8lu"\ " %8u %8d\n", total.in_interrupt, - total.ingress_calls, + total.stats.rx_packets, total.stats.tx_packets, total.tx_returned, total.tx_confirm, diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.h b/drivers/net/ethernet/freescale/dpa/dpaa_eth.h index 9e3958a..7a3ff91 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.h +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.h @@ -335,7 +335,6 @@ struct dpa_percpu_priv_s { int skb_count; #endif u32 in_interrupt; - u32 ingress_calls; u32 tx_returned; u32 tx_confirm; /* fragmented (non-linear) skbuffs received from the stack */ -- cgit v0.10.2