summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDanielle Ratson <danieller@mellanox.com>2020-07-09 16:18:15 +0300
committerDavid S. Miller <davem@davemloft.net>2020-07-09 13:15:29 -0700
commit46737a194945e540e3e2eb1fc870207928a9c2eb (patch)
tree60689b2ab9c1323229b9e9a1b3f9d3314a5735bb /include/net
parent10a429bab4462581bbda3fd7f41d4ec0ddc5e682 (diff)
downloadlinux-46737a194945e540e3e2eb1fc870207928a9c2eb.tar.bz2
devlink: Move switch_port attribute of devlink_port_attrs to devlink_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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/devlink.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 28f8d92c5741..de4b5dcdb4a5 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -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 {
@@ -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;
};