| Message ID | 5ed8ea615890a91fa4df59a7ae8311bbdf63cdcf.1715248281.git.daniel@makrotopia.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 87bfdbbb199249f677a92c6e13234b9c450992c6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: phy: air_en8811h: reset netdev rules when LED is set manually | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 9 May 2024 11:00:42 +0100 you wrote: > Setting LED_OFF via brightness_set should deactivate hw control, so make > sure netdev trigger rules also get cleared in that case. > This fixes unwanted restoration of the default netdev trigger rules and > matches the behaviour when using the 'netdev' trigger without any > hardware offloading. > > Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver") > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > > [...] Here is the summary with links: - [net-next,v2] net: phy: air_en8811h: reset netdev rules when LED is set manually https://git.kernel.org/netdev/net-next/c/87bfdbbb1992 You are awesome, thank you!
diff --git a/drivers/net/phy/air_en8811h.c b/drivers/net/phy/air_en8811h.c index 4c9a1c9c805e..3cdc8c6b30b6 100644 --- a/drivers/net/phy/air_en8811h.c +++ b/drivers/net/phy/air_en8811h.c @@ -544,6 +544,10 @@ static int air_hw_led_on_set(struct phy_device *phydev, u8 index, bool on) changed |= (priv->led[index].rules != 0); + /* clear netdev trigger rules in case LED_OFF has been set */ + if (!on) + priv->led[index].rules = 0; + if (changed) return phy_modify_mmd(phydev, MDIO_MMD_VEND2, AIR_PHY_LED_ON(index),
Setting LED_OFF via brightness_set should deactivate hw control, so make sure netdev trigger rules also get cleared in that case. This fixes unwanted restoration of the default netdev trigger rules and matches the behaviour when using the 'netdev' trigger without any hardware offloading. Fixes: 71e79430117d ("net: phy: air_en8811h: Add the Airoha EN8811H PHY driver") Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- v2: send to net-next instead of net tree because driver is present only in net-next tree. Improve commit description while at it. drivers/net/phy/air_en8811h.c | 4 ++++ 1 file changed, 4 insertions(+)