summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@freescale.com>2014-01-20 16:58:58 (GMT)
committerMadalin-Cristian Bucur <madalin.bucur@freescale.com>2014-01-29 13:59:01 (GMT)
commit80f55d79da8599840a62910d35d39b2f3d4e6d9f (patch)
tree71455e2514e074e3926a0170d41e649d424e5d40
parentc2676bf98a78c6e4cc15d4f1ebcb2616e7f9abd3 (diff)
downloadlinux-fsl-qoriq-80f55d79da8599840a62910d35d39b2f3d4e6d9f.tar.xz
dpaa_eth: moved two variables
Moved dpa_rx_extra_headroom and dpa_max_frm from dpaa_eth.c to dpaa_eth_common.c. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: I053d0e560cb0192030b038cb7b09612dd6e0174e Reviewed-on: http://git.am.freescale.net:8181/8116 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ruxandra Ioana Radulescu <ruxandra.radulescu@freescale.com> (cherry picked from commit eb8d5565a28bdb9ef4eff681e755f5022f4b5cae) Reviewed-on: http://git.am.freescale.net:8181/8465
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth.c4
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
index 902ede0..9d75d85 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
@@ -97,10 +97,6 @@ static uint16_t tx_timeout = 1000;
module_param(tx_timeout, ushort, S_IRUGO);
MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms");
-/* dpaa_eth mirror for the FMan values */
-int dpa_rx_extra_headroom;
-int dpa_max_frm;
-
static const char rtx[][3] = {
[RX] = "RX",
[TX] = "TX"
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c
index 066778c..4cc2760 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_common.c
@@ -56,6 +56,9 @@
static struct dpa_bp *dpa_bp_array[64];
+int dpa_max_frm;
+int dpa_rx_extra_headroom;
+
static const struct fqid_cell tx_confirm_fqids[] = {
{0, DPAA_ETH_TX_QUEUES}
};