net: Wrap ndo_do_ioctl() to prepare for DSA stacked ops (aad74d84) · Commits · 戴 / test

In preparation for adding another layer of call into a DSA stacked ops singleton, wrap the ndo_do_ioctl() call into dev_do_ioctl(). Reviewed-by:

net/core/dev_ioctl.c

+17 −7

Original line number	Diff line number	Diff line
		@@ -225,6 +225,22 @@ static int net_hwtstamp_validate(struct ifreq *ifr)
		return 0;
		}

		static int dev_do_ioctl(struct net_device *dev,
		struct ifreq *ifr, unsigned int cmd)
		{
		const struct net_device_ops *ops = dev->netdev_ops;
		int err = -EOPNOTSUPP;

		if (ops->ndo_do_ioctl) {
		if (netif_device_present(dev))
		err = ops->ndo_do_ioctl(dev, ifr, cmd);
		else
		err = -ENODEV;
		}

		return err;
		}

		/*
		* Perform the SIOCxIFxxx calls, inside rtnl_lock()
		*/
		@@ -323,13 +339,7 @@ static int dev_ifsioc(struct net net, struct ifreq ifr, unsigned int cmd)
		cmd == SIOCSHWTSTAMP \|\|
		cmd == SIOCGHWTSTAMP \|\|
		cmd == SIOCWANDEV) {
		err = -EOPNOTSUPP;
		if (ops->ndo_do_ioctl) {
		if (netif_device_present(dev))
		err = ops->ndo_do_ioctl(dev, ifr, cmd);
		else
		err = -ENODEV;
		}
		err = dev_do_ioctl(dev, ifr, cmd);
		} else
		err = -EINVAL;