[PATCH] net: fix phy_string_for_interface
commit ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") broke the phy_string_for_interface function. Fix it.
Fixes ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") Signed-off-by: Tim Harvey tharvey@gateworks.com Cc: Marek Behún marek.behun@nic.cz Cc: Stefan Roese sr@denx.de Cc: Ramon Fried rfried.dev@gmail.com Cc: Vladimir Oltean vladimir.oltean@nxp.com --- include/phy_interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/phy_interface.h b/include/phy_interface.h index ce3b5004ec22..fed3357b9a26 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -85,7 +85,7 @@ static const char * const backplane_mode_strings[] = { static inline const char *phy_string_for_interface(phy_interface_t i) { /* Default to unknown */ - if (i > PHY_INTERFACE_MODE_NA) + if (i >= PHY_INTERFACE_MODE_MAX) i = PHY_INTERFACE_MODE_NA;
return phy_interface_strings[i];
On 11.05.22 00:49, Tim Harvey wrote:
commit ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") broke the phy_string_for_interface function. Fix it.
Fixes ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") Signed-off-by: Tim Harvey tharvey@gateworks.com Cc: Marek Behún marek.behun@nic.cz Cc: Stefan Roese sr@denx.de Cc: Ramon Fried rfried.dev@gmail.com Cc: Vladimir Oltean vladimir.oltean@nxp.com
Reviewed-by: Stefan Roese sr@denx.de
Thanks, Stefan
include/phy_interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/phy_interface.h b/include/phy_interface.h index ce3b5004ec22..fed3357b9a26 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -85,7 +85,7 @@ static const char * const backplane_mode_strings[] = { static inline const char *phy_string_for_interface(phy_interface_t i) { /* Default to unknown */
- if (i > PHY_INTERFACE_MODE_NA)
if (i >= PHY_INTERFACE_MODE_MAX) i = PHY_INTERFACE_MODE_NA;
return phy_interface_strings[i];
Viele Grüße, Stefan Roese
On Tue, 10 May 2022 15:49:10 -0700 Tim Harvey tharvey@gateworks.com wrote:
commit ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") broke the phy_string_for_interface function. Fix it.
Fixes ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") Signed-off-by: Tim Harvey tharvey@gateworks.com Cc: Marek Behún marek.behun@nic.cz Cc: Stefan Roese sr@denx.de Cc: Ramon Fried rfried.dev@gmail.com Cc: Vladimir Oltean vladimir.oltean@nxp.com
include/phy_interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/phy_interface.h b/include/phy_interface.h index ce3b5004ec22..fed3357b9a26 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -85,7 +85,7 @@ static const char * const backplane_mode_strings[] = { static inline const char *phy_string_for_interface(phy_interface_t i) { /* Default to unknown */
- if (i > PHY_INTERFACE_MODE_NA)
if (i >= PHY_INTERFACE_MODE_MAX) i = PHY_INTERFACE_MODE_NA;
return phy_interface_strings[i];
Yikes.
Reviewed-by: Marek Behún marek.behun@nic.cz
On Wed, May 11, 2022 at 1:58 PM Marek Behún marek.behun@nic.cz wrote:
On Tue, 10 May 2022 15:49:10 -0700 Tim Harvey tharvey@gateworks.com wrote:
commit ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") broke the phy_string_for_interface function. Fix it.
Fixes ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") Signed-off-by: Tim Harvey tharvey@gateworks.com Cc: Marek Behún marek.behun@nic.cz Cc: Stefan Roese sr@denx.de Cc: Ramon Fried rfried.dev@gmail.com Cc: Vladimir Oltean vladimir.oltean@nxp.com
include/phy_interface.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/phy_interface.h b/include/phy_interface.h index ce3b5004ec22..fed3357b9a26 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -85,7 +85,7 @@ static const char * const backplane_mode_strings[] = { static inline const char *phy_string_for_interface(phy_interface_t i) { /* Default to unknown */
if (i > PHY_INTERFACE_MODE_NA)
if (i >= PHY_INTERFACE_MODE_MAX) i = PHY_INTERFACE_MODE_NA; return phy_interface_strings[i];Yikes.
Reviewed-by: Marek Behún marek.behun@nic.cz
Reviewed-by: Ramon Fried rfried.dev@gmail.com
On Tue, May 10, 2022 at 03:49:10PM -0700, Tim Harvey wrote:
commit ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") broke the phy_string_for_interface function. Fix it.
Fixes ffb0f6f488b9 ("treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA") Signed-off-by: Tim Harvey tharvey@gateworks.com Cc: Marek Behún marek.behun@nic.cz Cc: Stefan Roese sr@denx.de Cc: Ramon Fried rfried.dev@gmail.com Cc: Vladimir Oltean vladimir.oltean@nxp.com Reviewed-by: Stefan Roese sr@denx.de Reviewed-by: Marek Behún marek.behun@nic.cz Reviewed-by: Ramon Fried rfried.dev@gmail.com
Applied to u-boot/master, thanks!
participants (5)
-
Marek Behún -
Ramon Fried -
Stefan Roese -
Tim Harvey -
Tom Rini