Re: [PATCH 02/11] net: axienet: Add ioctl support

From: Ben Hutchings
Date: Thu Oct 04 2012 - 15:17:37 EST


On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> Allow user to access the MDIO from userspace.
>
> Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
> CC: Anirudha Sarangi <anirudh@xxxxxxxxxx>
> CC: John Linn <John.Linn@xxxxxxxxxx>
> CC: Grant Likely <grant.likely@xxxxxxxxxxxx>
> CC: Rob Herring <rob.herring@xxxxxxxxxxx>
> CC: David S. Miller <davem@xxxxxxxxxxxxx>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 50167ab..a5b41cd 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev)
> }
> #endif
>
> +/* Ioctl MII Interface */
> +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
> +{
> + struct axienet_local *priv = netdev_priv(dev);
> +
> + if (!netif_running(dev))
> + return -EINVAL;

Not sure this is the appropriate error code.

> + if (!priv->phy_dev)
> + return -ENODEV;

Error code should be EOPNOTSUPP - the device is present but just doesn't
support MDIO.

Ben.

> + return phy_mii_ioctl(priv->phy_dev, rq, cmd);
> +}
> +
> static const struct net_device_ops axienet_netdev_ops = {
> .ndo_open = axienet_open,
> .ndo_stop = axienet_stop,
> @@ -1061,6 +1075,7 @@ static const struct net_device_ops axienet_netdev_ops = {
> .ndo_set_mac_address = netdev_set_mac_address,
> .ndo_validate_addr = eth_validate_addr,
> .ndo_set_rx_mode = axienet_set_multicast_list,
> + .ndo_do_ioctl = axienet_ioctl,
> #ifdef CONFIG_NET_POLL_CONTROLLER
> .ndo_poll_controller = axienet_poll_controller,
> #endif

--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/