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-02-20 10:47:20 +0000
commit6e21a6526798d88c6849c98c866cbc75b16e3a58 (patch)
tree725af12f4deeef09cd6f9d8a9c38f6e2b1698d70
parent506fbfada6e0ee849633d4fc2560c469804355f0 (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 a35e42b6239d..d2eac5ee5419 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3187,6 +3187,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);
@@ -3199,9 +3201,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);
}