diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-10-04 17:05:58 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-04 18:11:08 -0700 |
| commit | 4cf6c57e61fee954f7b7685de31b80ec26843d27 (patch) | |
| tree | 9e09dd1b4a1045a649f9b12fd1775d794700abab /include | |
| parent | ipv6: Handle missing host route in __ipv6_ifa_notify (diff) | |
| download | linux-dev-4cf6c57e61fee954f7b7685de31b80ec26843d27.tar.xz linux-dev-4cf6c57e61fee954f7b7685de31b80ec26843d27.zip | |
net: phy: fix write to mii-ctrl1000 register
When userspace writes to the MII_ADVERTISE register, we update phylib's
advertising mask and trigger a renegotiation. However, writing to the
MII_CTRL1000 register, which contains the gigabit advertisement, does
neither. This can lead to phylib's copy of the advertisement becoming
de-synced with the values in the PHY register set, which can result in
incorrect negotiation resolution.
Fixes: 5502b218e001 ("net: phy: use phy_resolve_aneg_linkmode in genphy_read_status")
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mii.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mii.h b/include/linux/mii.h index 5cd824c1c0ca..4ce8901a1af6 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h @@ -455,6 +455,15 @@ static inline void mii_lpa_mod_linkmode_lpa_t(unsigned long *lp_advertising, lp_advertising, lpa & LPA_LPACK); } +static inline void mii_ctrl1000_mod_linkmode_adv_t(unsigned long *advertising, + u32 ctrl1000) +{ + linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, advertising, + ctrl1000 & ADVERTISE_1000HALF); + linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, advertising, + ctrl1000 & ADVERTISE_1000FULL); +} + /** * linkmode_adv_to_lcl_adv_t * @advertising:pointer to linkmode advertising |