diff options
| author | Timur Tabi <timur@codeaurora.org> | 2017-01-17 16:31:19 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-19 23:14:52 -0500 |
| commit | 8a43c052c7c1a7fd6cde46591deeb39be63a1223 (patch) | |
| tree | ceb6e991156c967af17c7d516cd1fbe8deb38e40 | |
| parent | 4567d686f5c6d955e57a3afa1741944c1e7f4033 (diff) | |
| download | linux-8a43c052c7c1a7fd6cde46591deeb39be63a1223.tar.bz2 | |
Revert "net: qcom/emac: configure the external phy to allow pause frames"
This reverts commit 3e884493448131179a5b7cae1ddca1028ffaecc8.
With commit 529ed1275263 ("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>
| -rw-r--r-- | drivers/net/ethernet/qualcomm/emac/emac-mac.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c index d297ed961da6..98570eb6ef1a 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); |