diff options
| author | Guanhua Gao <guanhua.gao@nxp.com> | 2017-11-17 06:27:08 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 07:32:41 (GMT) |
| commit | a9e205db4f71933b26125260fdedc9e40eda7cb4 (patch) | |
| tree | 7a195fe78b96fe7fbae905c6ae20de384e8262a6 | |
| parent | 1cec7a035949d281bf2d9c82446ea0b076771492 (diff) | |
| download | linux-a9e205db4f71933b26125260fdedc9e40eda7cb4.tar.xz | |
staging: fsl-dpaa2/eth: Fix compiling errors for backporting dash-lts
Fix compiling errors for backporting dash-lts.
Signed-off-by: Guanhua Gao <guanhua.gao>
| -rw-r--r-- | drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 10 | ||||
| -rw-r--r-- | drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index ca036fa..3c6f69b 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -2116,7 +2116,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) /* Enable flow control */ cfg.options = DPNI_LINK_OPT_AUTONEG | DPNI_LINK_OPT_PAUSE; - priv->tx_pause_frames = true; + priv->tx_pause_frames = 1; err = dpni_set_link_cfg(priv->mc_io, 0, priv->mc_token, &cfg); if (err) { @@ -2228,7 +2228,7 @@ int set_rx_taildrop(struct dpaa2_eth_priv *priv) case DPAA2_ETH_TD_NONE: memset(&td_queue, 0, sizeof(struct dpni_taildrop)); memset(&td_group, 0, sizeof(struct dpni_taildrop)); - priv->max_bufs_per_ch = DPAA2_ETH_NUM_BUFS_FC / + priv->num_bufs = DPAA2_ETH_NUM_BUFS_FC / priv->num_channels; break; case DPAA2_ETH_TD_QUEUE: @@ -2237,7 +2237,7 @@ int set_rx_taildrop(struct dpaa2_eth_priv *priv) td_queue.units = DPNI_CONGESTION_UNIT_BYTES; td_queue.threshold = DPAA2_ETH_TAILDROP_THRESH / dpaa2_eth_tc_count(priv); - priv->max_bufs_per_ch = DPAA2_ETH_NUM_BUFS_PER_CH; + priv->num_bufs = DPAA2_ETH_NUM_BUFS_TD; break; case DPAA2_ETH_TD_GROUP: memset(&td_queue, 0, sizeof(struct dpni_taildrop)); @@ -2245,7 +2245,7 @@ int set_rx_taildrop(struct dpaa2_eth_priv *priv) td_group.units = DPNI_CONGESTION_UNIT_FRAMES; td_group.threshold = NAPI_POLL_WEIGHT * dpaa2_eth_queue_count(priv); - priv->max_bufs_per_ch = NAPI_POLL_WEIGHT * + priv->num_bufs = NAPI_POLL_WEIGHT * dpaa2_eth_tc_count(priv); break; default: @@ -2260,7 +2260,7 @@ int set_rx_taildrop(struct dpaa2_eth_priv *priv) if (err) return err; - priv->refill_thresh = DPAA2_ETH_REFILL_THRESH(priv); + priv->refill_thresh = priv->num_bufs - DPAA2_ETH_BUFS_PER_CMD; return 0; } diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index 3f5419d..456efbc 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -436,7 +436,6 @@ struct dpaa2_eth_priv { u8 dcbx_mode; struct ieee_pfc pfc; bool vlan_clsf_set; - bool tx_pause_frames; }; #define dpaa2_eth_hash_enabled(priv) \ |