* [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running
2020-01-20 21:15 [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Heiner Kallweit
@ 2020-01-20 21:16 ` Heiner Kallweit
2020-01-20 22:03 ` Florian Fainelli
2020-01-20 22:16 ` Andrew Lunn
2020-01-20 21:17 ` [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl Heiner Kallweit
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Heiner Kallweit @ 2020-01-20 21:16 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
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: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
drivers/net/phy/phy.c | 6 +++---
include/linux/phy.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 175f951b6..7a5fe1137 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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,
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index da05b3480..cf25fa3be 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -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)
{
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 996c4df11..28e8d8102 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1231,7 +1231,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);
--
2.25.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running
2020-01-20 21:16 ` [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running Heiner Kallweit
@ 2020-01-20 22:03 ` Florian Fainelli
2020-01-20 22:16 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Florian Fainelli @ 2020-01-20 22:03 UTC (permalink / raw)
To: Heiner Kallweit, Andrew Lunn, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
On 1/20/20 1:16 PM, Heiner Kallweit wrote:
> 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: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running
2020-01-20 21:16 ` [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running Heiner Kallweit
2020-01-20 22:03 ` Florian Fainelli
@ 2020-01-20 22:16 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2020-01-20 22:16 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Florian Fainelli, David Miller, Mark Einon, Jay Cliburn,
Chris Snook, netdev@vger.kernel.org
On Mon, Jan 20, 2020 at 10:16:07PM +0100, Heiner Kallweit wrote:
> 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: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl
2020-01-20 21:15 [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Heiner Kallweit
2020-01-20 21:16 ` [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running Heiner Kallweit
@ 2020-01-20 21:17 ` Heiner Kallweit
2020-01-20 22:04 ` Florian Fainelli
2020-01-20 22:17 ` Andrew Lunn
2020-01-20 21:18 ` [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl Heiner Kallweit
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Heiner Kallweit @ 2020-01-20 21:17 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
Add a new version of phy_do_ioctl that doesn't check whether net_device
is running. It will typically be used if suitable drivers attach the
PHY in probe already.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/phy/phy.c | 16 +++++++++++++---
include/linux/phy.h | 1 +
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index cf25fa3be..d76e038cf 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -433,18 +433,28 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)
EXPORT_SYMBOL(phy_mii_ioctl);
/**
- * phy_do_ioctl_running - generic ndo_do_ioctl implementation
+ * phy_do_ioctl - 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_running(struct net_device *dev, struct ifreq *ifr, int cmd)
+int phy_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
- if (!netif_running(dev) || !dev->phydev)
+ if (!dev->phydev)
return -ENODEV;
return phy_mii_ioctl(dev->phydev, ifr, cmd);
}
+EXPORT_SYMBOL(phy_do_ioctl);
+
+/* same as phy_do_ioctl, but ensures that net_device is running */
+int phy_do_ioctl_running(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+ if (!netif_running(dev))
+ return -ENODEV;
+
+ return phy_do_ioctl(dev, ifr, cmd);
+}
EXPORT_SYMBOL(phy_do_ioctl_running);
void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies)
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 28e8d8102..3629f1369 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1231,6 +1231,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);
--
2.25.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl
2020-01-20 21:17 ` [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl Heiner Kallweit
@ 2020-01-20 22:04 ` Florian Fainelli
2020-01-20 22:17 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Florian Fainelli @ 2020-01-20 22:04 UTC (permalink / raw)
To: Heiner Kallweit, Andrew Lunn, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
On 1/20/20 1:17 PM, Heiner Kallweit wrote:
> Add a new version of phy_do_ioctl that doesn't check whether net_device
> is running. It will typically be used if suitable drivers attach the
> PHY in probe already.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl
2020-01-20 21:17 ` [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl Heiner Kallweit
2020-01-20 22:04 ` Florian Fainelli
@ 2020-01-20 22:17 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2020-01-20 22:17 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Florian Fainelli, David Miller, Mark Einon, Jay Cliburn,
Chris Snook, netdev@vger.kernel.org
On Mon, Jan 20, 2020 at 10:17:11PM +0100, Heiner Kallweit wrote:
> Add a new version of phy_do_ioctl that doesn't check whether net_device
> is running. It will typically be used if suitable drivers attach the
> PHY in probe already.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl
2020-01-20 21:15 [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Heiner Kallweit
2020-01-20 21:16 ` [PATCH net-next 1/3] net: phy: rename phy_do_ioctl to phy_do_ioctl_running Heiner Kallweit
2020-01-20 21:17 ` [PATCH net-next 2/3] net: phy: add new version of phy_do_ioctl Heiner Kallweit
@ 2020-01-20 21:18 ` Heiner Kallweit
2020-01-20 22:04 ` Florian Fainelli
2020-01-20 22:19 ` Andrew Lunn
2020-01-20 22:05 ` [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Florian Fainelli
2020-01-21 9:50 ` David Miller
4 siblings, 2 replies; 12+ messages in thread
From: Heiner Kallweit @ 2020-01-20 21:18 UTC (permalink / raw)
To: Andrew Lunn, Florian Fainelli, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
Convert suitable network drivers to use phy_do_ioctl.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/agere/et131x.c | 11 +----------
drivers/net/ethernet/atheros/ag71xx.c | 10 +---------
drivers/net/ethernet/faraday/ftgmac100.c | 11 +----------
drivers/net/ethernet/freescale/fec_mpc52xx.c | 12 +-----------
drivers/net/ethernet/rdc/r6040.c | 10 +---------
5 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c
index 3c51d8c50..cb6a761d5 100644
--- a/drivers/net/ethernet/agere/et131x.c
+++ b/drivers/net/ethernet/agere/et131x.c
@@ -3651,15 +3651,6 @@ static int et131x_close(struct net_device *netdev)
return del_timer_sync(&adapter->error_timer);
}
-static int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf,
- int cmd)
-{
- if (!netdev->phydev)
- return -EINVAL;
-
- return phy_mii_ioctl(netdev->phydev, reqbuf, cmd);
-}
-
/* et131x_set_packet_filter - Configures the Rx Packet filtering */
static int et131x_set_packet_filter(struct et131x_adapter *adapter)
{
@@ -3899,7 +3890,7 @@ static const struct net_device_ops et131x_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr,
.ndo_validate_addr = eth_validate_addr,
.ndo_get_stats = et131x_stats,
- .ndo_do_ioctl = et131x_ioctl,
+ .ndo_do_ioctl = phy_do_ioctl,
};
static int et131x_pci_setup(struct pci_dev *pdev,
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index f9db09e1f..e95687a78 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1394,14 +1394,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
return NETDEV_TX_OK;
}
-static int ag71xx_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
-{
- if (!ndev->phydev)
- return -EINVAL;
-
- return phy_mii_ioctl(ndev->phydev, ifr, cmd);
-}
-
static void ag71xx_oom_timer_handler(struct timer_list *t)
{
struct ag71xx *ag = from_timer(ag, t, oom_timer);
@@ -1618,7 +1610,7 @@ static const struct net_device_ops ag71xx_netdev_ops = {
.ndo_open = ag71xx_open,
.ndo_stop = ag71xx_stop,
.ndo_start_xmit = ag71xx_hard_start_xmit,
- .ndo_do_ioctl = ag71xx_do_ioctl,
+ .ndo_do_ioctl = phy_do_ioctl,
.ndo_tx_timeout = ag71xx_tx_timeout,
.ndo_change_mtu = ag71xx_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 48b3b72fe..4572797f0 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1536,15 +1536,6 @@ static int ftgmac100_stop(struct net_device *netdev)
return 0;
}
-/* optional */
-static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
-{
- if (!netdev->phydev)
- return -ENXIO;
-
- return phy_mii_ioctl(netdev->phydev, ifr, cmd);
-}
-
static void ftgmac100_tx_timeout(struct net_device *netdev, unsigned int txqueue)
{
struct ftgmac100 *priv = netdev_priv(netdev);
@@ -1597,7 +1588,7 @@ static const struct net_device_ops ftgmac100_netdev_ops = {
.ndo_start_xmit = ftgmac100_hard_start_xmit,
.ndo_set_mac_address = ftgmac100_set_mac_addr,
.ndo_validate_addr = eth_validate_addr,
- .ndo_do_ioctl = ftgmac100_do_ioctl,
+ .ndo_do_ioctl = phy_do_ioctl,
.ndo_tx_timeout = ftgmac100_tx_timeout,
.ndo_set_rx_mode = ftgmac100_set_rx_mode,
.ndo_set_features = ftgmac100_set_features,
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index de5278485..7a3f066e6 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -785,16 +785,6 @@ static const struct ethtool_ops mpc52xx_fec_ethtool_ops = {
};
-static int mpc52xx_fec_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
- struct phy_device *phydev = dev->phydev;
-
- if (!phydev)
- return -ENOTSUPP;
-
- return phy_mii_ioctl(phydev, rq, cmd);
-}
-
static const struct net_device_ops mpc52xx_fec_netdev_ops = {
.ndo_open = mpc52xx_fec_open,
.ndo_stop = mpc52xx_fec_close,
@@ -802,7 +792,7 @@ static const struct net_device_ops mpc52xx_fec_netdev_ops = {
.ndo_set_rx_mode = mpc52xx_fec_set_multicast_list,
.ndo_set_mac_address = mpc52xx_fec_set_mac_address,
.ndo_validate_addr = eth_validate_addr,
- .ndo_do_ioctl = mpc52xx_fec_ioctl,
+ .ndo_do_ioctl = phy_do_ioctl,
.ndo_tx_timeout = mpc52xx_fec_tx_timeout,
.ndo_get_stats = mpc52xx_fec_get_stats,
#ifdef CONFIG_NET_POLL_CONTROLLER
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index c23cb61bb..f5ecc410f 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -498,14 +498,6 @@ static int r6040_close(struct net_device *dev)
return 0;
}
-static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
- if (!dev->phydev)
- return -EINVAL;
-
- return phy_mii_ioctl(dev->phydev, rq, cmd);
-}
-
static int r6040_rx(struct net_device *dev, int limit)
{
struct r6040_private *priv = netdev_priv(dev);
@@ -957,7 +949,7 @@ static const struct net_device_ops r6040_netdev_ops = {
.ndo_set_rx_mode = r6040_multicast_list,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = eth_mac_addr,
- .ndo_do_ioctl = r6040_ioctl,
+ .ndo_do_ioctl = phy_do_ioctl,
.ndo_tx_timeout = r6040_tx_timeout,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = r6040_poll_controller,
--
2.25.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl
2020-01-20 21:18 ` [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl Heiner Kallweit
@ 2020-01-20 22:04 ` Florian Fainelli
2020-01-20 22:19 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Florian Fainelli @ 2020-01-20 22:04 UTC (permalink / raw)
To: Heiner Kallweit, Andrew Lunn, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
On 1/20/20 1:18 PM, Heiner Kallweit wrote:
> Convert suitable network drivers to use phy_do_ioctl.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl
2020-01-20 21:18 ` [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl Heiner Kallweit
2020-01-20 22:04 ` Florian Fainelli
@ 2020-01-20 22:19 ` Andrew Lunn
1 sibling, 0 replies; 12+ messages in thread
From: Andrew Lunn @ 2020-01-20 22:19 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Florian Fainelli, David Miller, Mark Einon, Jay Cliburn,
Chris Snook, netdev@vger.kernel.org
On Mon, Jan 20, 2020 at 10:18:37PM +0100, Heiner Kallweit wrote:
> Convert suitable network drivers to use phy_do_ioctl.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers
2020-01-20 21:15 [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Heiner Kallweit
` (2 preceding siblings ...)
2020-01-20 21:18 ` [PATCH net-next 3/3] net: convert suitable network drivers to use phy_do_ioctl Heiner Kallweit
@ 2020-01-20 22:05 ` Florian Fainelli
2020-01-21 9:50 ` David Miller
4 siblings, 0 replies; 12+ messages in thread
From: Florian Fainelli @ 2020-01-20 22:05 UTC (permalink / raw)
To: Heiner Kallweit, Andrew Lunn, David Miller, Mark Einon,
Jay Cliburn, Chris Snook
Cc: netdev@vger.kernel.org
On 1/20/20 1:15 PM, Heiner Kallweit wrote:
> 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.
>
> Heiner Kallweit (3):
> net: phy: rename phy_do_ioctl to phy_do_ioctl_running
> net: phy: add new version of phy_do_ioctl
> net: convert suitable network drivers to use phy_do_ioctl
>
> drivers/net/ethernet/agere/et131x.c | 11 +----------
> drivers/net/ethernet/atheros/ag71xx.c | 10 +---------
> drivers/net/ethernet/faraday/ftgmac100.c | 11 +----------
> drivers/net/ethernet/freescale/fec_mpc52xx.c | 12 +-----------
> drivers/net/ethernet/rdc/r6040.c | 10 +---------
> drivers/net/ethernet/realtek/r8169_main.c | 2 +-
> drivers/net/phy/phy.c | 12 +++++++++++-
> include/linux/phy.h | 1 +
> 8 files changed, 18 insertions(+), 51 deletions(-)
Now the diffstat is convincing :) Thanks!
--
Florian
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers
2020-01-20 21:15 [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Heiner Kallweit
` (3 preceding siblings ...)
2020-01-20 22:05 ` [PATCH net-next 0/3] net: phy: add new version of phy_do_ioctl and convert suitable drivers Florian Fainelli
@ 2020-01-21 9:50 ` David Miller
4 siblings, 0 replies; 12+ messages in thread
From: David Miller @ 2020-01-21 9:50 UTC (permalink / raw)
To: hkallweit1; +Cc: andrew, f.fainelli, mark.einon, jcliburn, chris.snook, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 20 Jan 2020 22:15:11 +0100
> 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.
Series applied, thanks.
^ permalink raw reply [flat|nested] 12+ messages in thread