diff options
| author |   Timur Tabi <timur@codeaurora.org> | 2016-11-07 10:51:41 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-09 18:45:24 -0500 |
| commit | df63022e182de4041b65ae22df1950d3416b577e (patch) | |
| tree | 22ef540a7817db2a24cc612ecd9dd71b973ea92e /drivers/net/ethernet/qualcomm/emac/emac-mac.c | |
| parent | net: qcom/emac: configure the external phy to allow pause frames (diff) | |
| download | linux-dev-df63022e182de4041b65ae22df1950d3416b577e.tar.xz linux-dev-df63022e182de4041b65ae22df1950d3416b577e.zip | |
net: qcom/emac: enable flow control if requested
If the PHY has been configured to allow pause frames, then the MAC
should be configured to generate and/or accept those frames.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qualcomm/emac/emac-mac.c')
| -rw-r--r-- | drivers/net/ethernet/qualcomm/emac/emac-mac.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qualcomm/emac/emac-mac.c b/drivers/net/ethernet/qualcomm/emac/emac-mac.c index 70a55dcc431d..0b4deb31e742 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac-mac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac-mac.c @@ -575,10 +575,11 @@ void emac_mac_start(struct emac_adapter *adpt) mac |= TXEN | RXEN; /* enable RX/TX */ - /* We don't have ethtool support yet, so force flow-control mode - * to 'full' always. - */ - mac |= TXFC | RXFC; + /* Configure MAC flow control to match the PHY's settings. */ + if (phydev->pause) + mac |= RXFC; + if (phydev->pause != phydev->asym_pause) + mac |= TXFC; /* setup link speed */ mac &= ~SPEED_MASK; |