]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: phylink: allow half-duplex modes with RATE_MATCH_PAUSE
authorDaniel Golle <daniel@makrotopia.org>
Fri, 11 Oct 2024 03:40:39 +0000 (04:40 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 15 Oct 2024 00:41:00 +0000 (17:41 -0700)
PHYs performing rate-matching using MAC-side flow-control always
perform duplex-matching as well in case they are supporting
half-duplex modes at all.
No longer remove half-duplex modes from their capabilities.

Suggested-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/b157c0c289cfba024039a96e635d037f9d946745.1728617993.git.daniel@makrotopia.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/phylink.c

index 4309317de3d1435bf97701ee1b0856cd09c211e9..24a3144e870a5c4da1b24af319ee4a0bcc95f347 100644 (file)
@@ -599,15 +599,8 @@ static unsigned long phylink_get_capabilities(phy_interface_t interface,
                 * max speed at full duplex.
                 */
                if (mac_capabilities &
-                   phylink_cap_from_speed_duplex(max_speed, DUPLEX_FULL)) {
-                       /* Although a duplex-matching phy might exist, we
-                        * conservatively remove these modes because the MAC
-                        * will not be aware of the half-duplex nature of the
-                        * link.
-                        */
+                   phylink_cap_from_speed_duplex(max_speed, DUPLEX_FULL))
                        matched_caps = GENMASK(__fls(caps), __fls(MAC_10HD));
-                       matched_caps &= ~(MAC_1000HD | MAC_100HD | MAC_10HD);
-               }
                break;
        }
        case RATE_MATCH_CRS: