]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "net: qcom/emac: configure the external phy to allow pause frames"
authorTimur Tabi <timur@codeaurora.org>
Tue, 17 Jan 2017 22:31:19 +0000 (16:31 -0600)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Jan 2017 04:14:52 +0000 (23:14 -0500)
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 <timur@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qualcomm/emac/emac-mac.c

index d297ed961da6e708312b8da3af7b92c5cecba7d4..98570eb6ef1ad588c14a5d878269c807328858fb 100644 (file)
@@ -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);