ethtool: use phydev variable
Subsystems (3)
PATCH 1/1 ethtool: use phydev variable
From: Tom Rix <[email protected]>
In ethtool_get_phy_stats(), the phydev varaible is set to dev->phydev but dev->phydev is still used. Replace dev->phydev uses with phydev.
--- net/ethtool/ioctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/ethtool/ioctl.c +4 -4
@@ -2096,9 +2096,9 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)if (!phydev && (!ops->get_ethtool_phy_stats || !ops->get_sset_count))return -EOPNOTSUPP ; -if (dev->phydev && !ops->get_ethtool_phy_stats && +if (phydev && !ops->get_ethtool_phy_stats && phy_ops && phy_ops->get_sset_count) - n_stats = phy_ops->get_sset_count (dev->phydev); + n_stats = phy_ops->get_sset_count (phydev);else n_stats = ops->get_sset_count (dev,ETH_SS_PHY_STATS );if (n_stats <0 )
@@ -2117,9 +2117,9 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)if (!data)return -ENOMEM ; -if (dev->phydev && !ops->get_ethtool_phy_stats && +if (phydev && !ops->get_ethtool_phy_stats && phy_ops && phy_ops->get_stats) { - ret = phy_ops->get_stats (dev->phydev, &stats, data); + ret = phy_ops->get_stats (phydev, &stats, data);if (ret <0 ) goto out; }else {
Signature · 1 line
2.26.3
Quoted 7 lines · On Wed, Jan 05, 2022 at 06:10:20AM -0800, [email protected] wrote:
From: Tom Rix <[email protected]>
In
ethtool_get_phy_stats(), the phydev varaible is set todev->phydevbutdev->phydevis still used. Replacedev->phydevuses with phydev.Signed-off-by Tom Rix <[email protected]>
Andrew
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Wed, 5 Jan 2022 06:10:20 -0800 you wrote:
From: Tom Rix <[email protected]>
In
ethtool_get_phy_stats(), the phydev varaible is set todev->phydevbutdev->phydevis still used. Replacedev->phydevuses with phydev.Signed-off-by Tom Rix <[email protected]>[...]
Here is the summary with links:
- ethtool: use phydev variable
https://git.kernel.org/netdev/net-next/c/ccd21ec5b8dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html