Commit 3231e5d2 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: rename phy_do_ioctl to phy_do_ioctl_running 



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.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bea54165

drivers/net/ethernet/realtek/r8169_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5158,7 +5158,7 @@ static const struct net_device_ops rtl_netdev_ops = { 
	.ndo_fix_features	= rtl8169_fix_features,

	.ndo_set_features	= rtl8169_set_features,

	.ndo_set_mac_address	= rtl_set_mac_address,

	.ndo_do_ioctl		= phy_do_ioctl,

	.ndo_do_ioctl		= phy_do_ioctl_running,

	.ndo_set_rx_mode	= rtl_set_rx_mode,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= rtl8169_netpoll,

drivers/net/phy/phy.c

+3 −3
Original line number Diff line number Diff line
@@ -433,19 +433,19 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd) 
EXPORT_SYMBOL(phy_mii_ioctl);



/**

 * phy_do_ioctl - generic ndo_do_ioctl implementation

 * phy_do_ioctl_running - generic ndo_do_ioctl implementation

 * @dev: the net_device struct

 * @ifr: &struct ifreq for socket ioctl's

 * @cmd: ioctl cmd to execute

 */

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)

{

	if (!netif_running(dev) || !dev->phydev)

		return -ENODEV;



	return phy_mii_ioctl(dev->phydev, ifr, cmd);

}

EXPORT_SYMBOL(phy_do_ioctl);

EXPORT_SYMBOL(phy_do_ioctl_running);



void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies)

{

include/linux/phy.h

+1 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, 
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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE