diff options
| author | Pan Jiafei <Jiafei.Pan@freescale.com> | 2015-03-10 07:50:00 (GMT) |
|---|---|---|
| committer | Honghua Yin <Hong-Hua.Yin@freescale.com> | 2015-03-25 08:17:58 (GMT) |
| commit | 31be9b970697911e7c7ebfe000f0f0e2abc9779f (patch) | |
| tree | 422bf186300468777787a900a15a67118e713958 /drivers/net/ethernet/freescale/dpa | |
| parent | 4b6a7ab88141894775895cfc7f4c21eefcec35e0 (diff) | |
| download | linux-fsl-qoriq-31be9b970697911e7c7ebfe000f0f0e2abc9779f.tar.xz | |
capwap: sync with new config flavor for FManV3
CONFIG_FMAN_T4240 was eliminated.
Instead, there are now two flags representing FmanV3:
CONFIG_FMAN_V3H for FmanV3H arch and
CONFIG_FMAN_V3L for FmanV3L arch
Signed-off-by: Pan Jiafei <Jiafei.Pan@freescale.com>
Change-Id: Ia0de7b70a0c110e379edb38ee61779e7560979a7
Reviewed-on: http://git.am.freescale.net:8181/33329
Reviewed-by: Mandy Lavi <Mandy.Lavi@freescale.com>
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/capwap/dpaa_capwap_fq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/capwap/dpaa_capwap_fq.c b/drivers/net/ethernet/freescale/dpa/capwap/dpaa_capwap_fq.c index 8c4683a..1825bf4 100644 --- a/drivers/net/ethernet/freescale/dpa/capwap/dpaa_capwap_fq.c +++ b/drivers/net/ethernet/freescale/dpa/capwap/dpaa_capwap_fq.c @@ -465,7 +465,7 @@ int capwap_fq_pre_init(struct dpaa_capwap_domain *capwap_domain) channel = (uint16_t) fm_get_tx_port_channel(net_priv->mac_dev->port_dev[TX]); context_a = (u64)1 << 63; -#ifdef CONFIG_FMAN_T4240 +#if (defined CONFIG_FMAN_V3H) || (defined CONFIG_FMAN_V3L) /* Configure the Tx queues for recycled frames, such that the * buffers are released by FMan and no confirmation is sent */ |