summaryrefslogtreecommitdiff
path: root/include/linux/phy.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-09 07:47:32 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-09 07:47:32 +0100
commitc2fb9a214da1efc3f8968daa795a1bbbf50cbfc8 (patch)
tree9bcfc2ea89e09ec2614e4d84518ffcb4327eb223 /include/linux/phy.h
parent5220cb493bf418cc4ce5f3ba961dbd0207441731 (diff)
parentb7bfaa761d760e72a969d116517eaa12e404c262 (diff)
downloadlwn-c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8.tar.gz
lwn-c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8.zip
Merge 6.2-rc3 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r--include/linux/phy.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 71eeb4e3b1fd..6378c997ded5 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -826,10 +826,7 @@ struct phy_driver {
* whether to advertise lower-speed modes for that interface. It is
* assumed that if a rate matching mode is supported on an interface,
* then that interface's rate can be adapted to all slower link speeds
- * supported by the phy. If iface is %PHY_INTERFACE_MODE_NA, and the phy
- * supports any kind of rate matching for any interface, then it must
- * return that rate matching mode (preferring %RATE_MATCH_PAUSE to
- * %RATE_MATCH_CRS). If the interface is not supported, this should
+ * supported by the phy. If the interface is not supported, this should
* return %RATE_MATCH_NONE.
*/
int (*get_rate_matching)(struct phy_device *phydev,