diff options
author | Jiri Pirko <jiri@mellanox.com> | 2019-04-03 08:24:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-04 20:42:36 -0400 |
commit | 15b04aceeb83086ea3109c331cb7d8c2767fa0c6 (patch) | |
tree | cf87b7b657cdd87f7c6ba1986aa3751560024366 /net/dsa/dsa2.c | |
parent | df535f4c47a60fd6bf8f1327e9f87628e581e136 (diff) |
dsa: pass switch ID through devlink_port_attrs_set()
Pass the switch ID down the to devlink through devlink_port_attrs_set()
so it can be used by devlink_compat_switch_id_get(). Leave
ndo_get_port_parent_id implementation only for legacy.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa2.c')
-rw-r--r-- | net/dsa/dsa2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 4493b2ff3438..d122f1bcdab2 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c | |||
@@ -260,6 +260,7 @@ static int dsa_port_setup(struct dsa_port *dp) | |||
260 | { | 260 | { |
261 | enum devlink_port_flavour flavour; | 261 | enum devlink_port_flavour flavour; |
262 | struct dsa_switch *ds = dp->ds; | 262 | struct dsa_switch *ds = dp->ds; |
263 | struct dsa_switch_tree *dst = ds->dst; | ||
263 | int err; | 264 | int err; |
264 | 265 | ||
265 | if (dp->type == DSA_PORT_TYPE_UNUSED) | 266 | if (dp->type == DSA_PORT_TYPE_UNUSED) |
@@ -286,7 +287,8 @@ static int dsa_port_setup(struct dsa_port *dp) | |||
286 | * independent from front panel port numbers. | 287 | * independent from front panel port numbers. |
287 | */ | 288 | */ |
288 | devlink_port_attrs_set(&dp->devlink_port, flavour, | 289 | devlink_port_attrs_set(&dp->devlink_port, flavour, |
289 | dp->index, false, 0, NULL, 0); | 290 | dp->index, false, 0, |
291 | (const char *) &dst->index, sizeof(dst->index)); | ||
290 | err = devlink_port_register(ds->devlink, &dp->devlink_port, | 292 | err = devlink_port_register(ds->devlink, &dp->devlink_port, |
291 | dp->index); | 293 | dp->index); |
292 | if (err) | 294 | if (err) |