diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-21 10:50:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-21 10:50:41 +0100 |
| commit | 3ccc897b228a08db741469e1d19812b38afe015e (patch) | |
| tree | 4c11657e134558a048c4ece421bbf4cd274550f3 /include/linux | |
| parent | bea5416561b1b997adbe3a04a5665e647c589a13 (diff) | |
| parent | f1294617d2f38bd2b9f6cce516b0326858b61182 (diff) | |
Merge branch 'phy-add-new-version-of-phy_do_ioctl-and-convert-suitable-drivers'
Heiner Kallweit says:
====================
net: phy: add new version of phy_do_ioctl and convert suitable drivers
We just added phy_do_ioctl, but it turned out that we need another
version of this function that doesn't check whether net_device is
running. So rename phy_do_ioctl to phy_do_ioctl_running and add a
new version of phy_do_ioctl. Eventually convert suitable drivers
to use phy_do_ioctl.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index be6b3a1b03da..c570e162e05e 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1243,6 +1243,7 @@ int phy_ethtool_ksettings_set(struct phy_device *phydev, const struct ethtool_link_ksettings *cmd); int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); int phy_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +int phy_do_ioctl_running(struct net_device *dev, struct ifreq *ifr, int cmd); void phy_request_interrupt(struct phy_device *phydev); void phy_free_interrupt(struct phy_device *phydev); void phy_print_status(struct phy_device *phydev); |