| Message ID | E1j7Hq1-0004Fc-MX@rmk-PC.armlinux.org.uk |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | dpaa2-eth: add support for mii ioctls | expand |
On Thu, Feb 27, 2020 at 12:00:21PM +0000, Russell King wrote: > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
> Subject: [PATCH] dpaa2-eth: add support for mii ioctls > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Ioana Ciornei <ioana.ciornei@nxp.com> > --- > drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c > b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c > index 40290fea9e36..f1ab6bb5db5d 100644 > --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c > +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c > @@ -1704,10 +1704,15 @@ static int dpaa2_eth_ts_ioctl(struct net_device > *dev, struct ifreq *rq, int cmd) > > static int dpaa2_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { > + struct dpaa2_eth_priv *priv = netdev_priv(dev); > + > if (cmd == SIOCSHWTSTAMP) > return dpaa2_eth_ts_ioctl(dev, rq, cmd); > > - return -EINVAL; > + if (priv->mac) > + return phylink_mii_ioctl(priv->mac->phylink, rq, cmd); > + > + return -EOPNOTSUPP; > } > > static bool xdp_mtu_valid(struct dpaa2_eth_priv *priv, int mtu) > -- > 2.20.1
From: Russell King <rmk+kernel@armlinux.org.uk> Date: Thu, 27 Feb 2020 12:00:21 +0000 > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Applied.
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 40290fea9e36..f1ab6bb5db5d 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -1704,10 +1704,15 @@ static int dpaa2_eth_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int dpaa2_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { + struct dpaa2_eth_priv *priv = netdev_priv(dev); + if (cmd == SIOCSHWTSTAMP) return dpaa2_eth_ts_ioctl(dev, rq, cmd); - return -EINVAL; + if (priv->mac) + return phylink_mii_ioctl(priv->mac->phylink, rq, cmd); + + return -EOPNOTSUPP; } static bool xdp_mtu_valid(struct dpaa2_eth_priv *priv, int mtu)
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)