Skip to content

Commit

Permalink
net: dsa: return -ENODEV is there is no slave PHY
Browse files Browse the repository at this point in the history
Instead of returning -EOPNOTSUPP when a slave device has no PHY,
directly return -ENODEV as ethtool and phylib do.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vivien Didelot authored and David S. Miller committed Sep 27, 2017
1 parent f6fc5b4 commit f4344e0
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions net/dsa/slave.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct dsa_slave_priv *p = netdev_priv(dev);

if (p->phy != NULL)
return phy_mii_ioctl(p->phy, ifr, cmd);
if (!p->phy)
return -ENODEV;

return -EOPNOTSUPP;
return phy_mii_ioctl(p->phy, ifr, cmd);
}

static int dsa_slave_port_attr_set(struct net_device *dev,
Expand Down Expand Up @@ -429,7 +429,7 @@ dsa_slave_get_link_ksettings(struct net_device *dev,
struct dsa_slave_priv *p = netdev_priv(dev);

if (!p->phy)
return -EOPNOTSUPP;
return -ENODEV;

phy_ethtool_ksettings_get(p->phy, cmd);

Expand All @@ -442,10 +442,10 @@ dsa_slave_set_link_ksettings(struct net_device *dev,
{
struct dsa_slave_priv *p = netdev_priv(dev);

if (p->phy != NULL)
return phy_ethtool_ksettings_set(p->phy, cmd);
if (!p->phy)
return -ENODEV;

return -EOPNOTSUPP;
return phy_ethtool_ksettings_set(p->phy, cmd);
}

static void dsa_slave_get_drvinfo(struct net_device *dev,
Expand Down Expand Up @@ -481,22 +481,22 @@ static int dsa_slave_nway_reset(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);

if (p->phy != NULL)
return genphy_restart_aneg(p->phy);
if (!p->phy)
return -ENODEV;

return -EOPNOTSUPP;
return genphy_restart_aneg(p->phy);
}

static u32 dsa_slave_get_link(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);

if (p->phy != NULL) {
genphy_update_link(p->phy);
return p->phy->link;
}
if (!p->phy)
return -ENODEV;

return -EOPNOTSUPP;
genphy_update_link(p->phy);

return p->phy->link;
}

static int dsa_slave_get_eeprom_len(struct net_device *dev)
Expand Down

0 comments on commit f4344e0

Please sign in to comment.