Skip to content

Commit

Permalink
devlink: Move switch_port attribute of devlink_port_attrs to devlink_…
Browse files Browse the repository at this point in the history
…port

The struct devlink_port_attrs holds the attributes of devlink_port.

Similarly to the previous patch, 'switch_port' attribute is another
exception.

Move 'switch_port' to be devlink_port's field.

Signed-off-by: Danielle Ratson <danieller@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Danielle Ratson authored and David S. Miller committed Jul 9, 2020
1 parent 10a429b commit 46737a1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions include/net/devlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ struct devlink_port_pci_vf_attrs {
};

struct devlink_port_attrs {
u8 split:1,
switch_port:1;
u8 split:1;
enum devlink_port_flavour flavour;
struct netdev_phys_item_id switch_id;
union {
Expand All @@ -89,7 +88,8 @@ struct devlink_port {
enum devlink_port_type desired_type;
void *type_dev;
struct devlink_port_attrs attrs;
u8 attrs_set:1;
u8 attrs_set:1,
switch_port:1;
struct delayed_work type_warn_dw;
};

Expand Down
6 changes: 3 additions & 3 deletions net/core/devlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -7521,13 +7521,13 @@ static int __devlink_port_attrs_set(struct devlink_port *devlink_port,
devlink_port->attrs_set = true;
attrs->flavour = flavour;
if (switch_id) {
attrs->switch_port = true;
devlink_port->switch_port = true;
if (WARN_ON(switch_id_len > MAX_PHYS_ITEM_ID_LEN))
switch_id_len = MAX_PHYS_ITEM_ID_LEN;
memcpy(attrs->switch_id.id, switch_id, switch_id_len);
attrs->switch_id.id_len = switch_id_len;
} else {
attrs->switch_port = false;
devlink_port->switch_port = false;
}
return 0;
}
Expand Down Expand Up @@ -9461,7 +9461,7 @@ int devlink_compat_switch_id_get(struct net_device *dev,
* any devlink lock as only permanent values are accessed.
*/
devlink_port = netdev_to_devlink_port(dev);
if (!devlink_port || !devlink_port->attrs.switch_port)
if (!devlink_port || !devlink_port->switch_port)
return -EOPNOTSUPP;

memcpy(ppid, &devlink_port->attrs.switch_id, sizeof(*ppid));
Expand Down

0 comments on commit 46737a1

Please sign in to comment.