Commit 72636db5 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

switchdev: Complete removal of switchdev_port_attr_get() 



We have no more in tree users of switchdev_port_attr_get() after
d0e698d5 ("Merge branch 'net-Get-rid-of-switchdev_port_attr_get'")
so completely remove the function signature and body.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75104db0

include/net/switchdev.h

+0 −4
Original line number Diff line number Diff line
@@ -115,13 +115,9 @@ typedef int switchdev_obj_dump_cb_t(struct switchdev_obj *obj); 
/**

 * struct switchdev_ops - switchdev operations

 *

 * @switchdev_port_attr_get: Get a port attribute (see switchdev_attr).

 *

 * @switchdev_port_attr_set: Set a port attribute (see switchdev_attr).

 */

struct switchdev_ops {

	int	(*switchdev_port_attr_get)(struct net_device *dev,

					   struct switchdev_attr *attr);

	int	(*switchdev_port_attr_set)(struct net_device *dev,

					   const struct switchdev_attr *attr,

					   struct switchdev_trans *trans);

net/switchdev/switchdev.c

+0 −42
Original line number Diff line number Diff line
@@ -174,48 +174,6 @@ static int switchdev_deferred_enqueue(struct net_device *dev, 
	return 0;

}



/**

 *	switchdev_port_attr_get - Get port attribute

 *

 *	@dev: port device

 *	@attr: attribute to get

 */

int switchdev_port_attr_get(struct net_device *dev, struct switchdev_attr *attr)

{

	const struct switchdev_ops *ops = dev->switchdev_ops;

	struct net_device *lower_dev;

	struct list_head *iter;

	struct switchdev_attr first = {

		.id = SWITCHDEV_ATTR_ID_UNDEFINED

	};

	int err = -EOPNOTSUPP;



	if (ops && ops->switchdev_port_attr_get)

		return ops->switchdev_port_attr_get(dev, attr);



	if (attr->flags & SWITCHDEV_F_NO_RECURSE)

		return err;



	/* Switch device port(s) may be stacked under

	 * bond/team/vlan dev, so recurse down to get attr on

	 * each port.  Return -ENODATA if attr values don't

	 * compare across ports.

	 */



	netdev_for_each_lower_dev(dev, lower_dev, iter) {

		err = switchdev_port_attr_get(lower_dev, attr);

		if (err)

			break;

		if (first.id == SWITCHDEV_ATTR_ID_UNDEFINED)

			first = *attr;

		else if (memcmp(&first, attr, sizeof(*attr)))

			return -ENODATA;

	}



	return err;

}

EXPORT_SYMBOL_GPL(switchdev_port_attr_get);



static int __switchdev_port_attr_set(struct net_device *dev,

				     const struct switchdev_attr *attr,

				     struct switchdev_trans *trans)

CRA Git | Maintained and supported by SUSTech CRA and CCSE