Skip to content

Commit

Permalink
switchdev: Complete removal of switchdev_port_attr_get()
Browse files Browse the repository at this point in the history
We have no more in tree users of switchdev_port_attr_get() after
d0e698d ("Merge branch 'net-Get-rid-of-switchdev_port_attr_get'")
so completely remove the function signature and body.

Signed-off-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
ffainelli authored and davem330 committed Feb 25, 2019
1 parent 75104db commit 72636db
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 46 deletions.
4 changes: 0 additions & 4 deletions include/net/switchdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
42 changes: 0 additions & 42 deletions net/switchdev/switchdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 72636db

Please sign in to comment.