summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-07-12 00:04:13 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2017-01-05 22:38:21 +0000
commit657f579d2a150ea7a75e663a8850d0febdffe781 (patch)
treecb94c6c8563edd6b4710b2a7223f907f1a59a57c
parent71eff06a95acc75a1b0eca1ee6bb40978f3cdbe0 (diff)
net: mvneta: enable flow control for fixed connections
Allow symetric flow control to be enabled for fixed link connections as well as other types of connections by setting the supported and advertised capability bits. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 8f4fd355e547..3fd8c7704da6 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3128,6 +3128,8 @@ static void mvneta_validate_support(struct net_device *ndev, unsigned int mode,
phylink_set(mask, BNC);
phylink_set(mask, Backplane);
+ /* Asymmetric pause is unsupported */
+ phylink_set(mask, Pause);
/* Half-duplex at speeds higher than 100Mbit is unsupported */
phylink_set(mask, 1000baseT_Full);
phylink_set(mask, 1000baseX_Full);
@@ -3140,9 +3142,6 @@ static void mvneta_validate_support(struct net_device *ndev, unsigned int mode,
phylink_set(mask, 100baseT_Full);
}
- if (mode != MLO_AN_FIXED)
- phylink_set(mask, Pause);
-
bitmap_and(support, support, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);
}