From 953a6c737e36f9f4dcf952c2a14a3a457326c222 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Tue, 17 Jan 2017 16:31:19 -0600 Subject: [PATCH] Revert "net: qcom/emac: configure the external phy to allow pause frames" This reverts commit c8159214b975a24c8385ebeab45fdba01e5fc3ad. With commit c1d13252d2d1 ("net: phy: phy drivers should not set SUPPORTED_[Asym_]Pause"), phylib now handles automatically enabling pause frame support in the PHY, and the MAC driver should follow suit. Since the EMAC driver driver does this, we no longer need to force pause frames support. Signed-off-by: Timur Tabi Signed-off-by: David S. Miller --- drivers/net/ethernet/qualcomm/emac/emac-mac.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c index d297ed961da6e..98570eb6ef1ad 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac-mac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac-mac.c @@ -1004,12 +1004,6 @@ int emac_mac_up(struct emac_adapter *adpt) writel((u32)~DIS_INT, adpt->base + EMAC_INT_STATUS); writel(adpt->irq.mask, adpt->base + EMAC_INT_MASK); - /* Enable pause frames. Without this feature, the EMAC has been shown - * to receive (and drop) frames with FCS errors at gigabit connections. - */ - adpt->phydev->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; - adpt->phydev->advertising |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; - adpt->phydev->irq = PHY_IGNORE_INTERRUPT; phy_start(adpt->phydev); -- 2.39.5