summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-07-25 15:02:52 +0100
committerDavid S. Miller <davem@davemloft.net>2017-08-06 20:55:28 -0700
commit1f3645bb41f2e2b15fe5799476284bf2cd138722 (patch)
treef25f6dd9cfe323c365418d7af046d8d7e777c07b
parent0ccb4fc65d2799a315d5ee8732d75f35a114379c (diff)
downloadlinux-stable-1f3645bb41f2e2b15fe5799476284bf2cd138722.tar.gz
linux-stable-1f3645bb41f2e2b15fe5799476284bf2cd138722.tar.bz2
linux-stable-1f3645bb41f2e2b15fe5799476284bf2cd138722.zip
net: phy: add 1000Base-X to phy settings table
Add the missing 1000Base-X entry to the phy settings table. This was not included because the original code could not cope with more than 32 bits of link mode mask. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/phy-core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index c07845e77004..21f75ae244b3 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -90,6 +90,11 @@ static const struct phy_setting settings[] = {
{
.speed = SPEED_1000,
.duplex = DUPLEX_FULL,
+ .bit = ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+ },
+ {
+ .speed = SPEED_1000,
+ .duplex = DUPLEX_FULL,
.bit = ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
},
{