From: John Jacques <john.jacq...@intel.com>
Signed-off-by: John Jacques <john.jacq...@intel.com>
---
drivers/net/ethernet/intel/axxia/nemac.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/intel/axxia/nemac.c
b/drivers/net/ethernet/intel/axxia/nemac.c
index ee6a240..4a3ab72 100644
--- a/drivers/net/ethernet/intel/axxia/nemac.c
+++ b/drivers/net/ethernet/intel/axxia/nemac.c
@@ -507,17 +507,12 @@ nemac_link_up(struct nemac_priv *priv)
writel(gmii_ctrl, priv->reg + NEM_GMAC_ANEG_CTRL_R);
writel(rgmii_clk, priv->reg + NEM_DMA_MISC_CTL);
- if (phy_dev->pause) {
- /* Enable GMAC and DMA to act on and send PAUSE frames */
- nemac_set(priv, NEM_GMAC_ENABLE_R,
- GMAC_RX_PAUSE_EN | GMAC_TX_PAUSE_EN);
- nemac_set(priv, NEM_DMA_CTL, DMACTL_ALLOW_TX_PAUSE);
- } else {
- /* Disable use of PAUSE frames */
- nemac_clr(priv, NEM_GMAC_ENABLE_R,
- GMAC_RX_PAUSE_EN | GMAC_TX_PAUSE_EN);
- nemac_clr(priv, NEM_DMA_CTL, DMACTL_ALLOW_TX_PAUSE);
- }
+ /* Pause frames are a problem on the Axxia development board,
+ * so don't enable them.
+ */
+
+ nemac_clr(priv, NEM_GMAC_ENABLE_R, GMAC_RX_PAUSE_EN | GMAC_TX_PAUSE_EN);
+ nemac_clr(priv, NEM_DMA_CTL, DMACTL_ALLOW_TX_PAUSE);
/* Enable RX */
nemac_set(priv, NEM_GMAC_ENABLE_R, GMAC_RX_EN);
--
1.9.1
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
