From: Jiri Pirko <j...@mellanox.com> Since each non-legacy slave has its own devlink port instance correctly set, rely on devlink core to generate correct phys port name.
Signed-off-by: Jiri Pirko <j...@mellanox.com> --- v3->v4: - changed to return -EOPNOTSUPP for non-legacy ports v1->v2: - new patch --- net/dsa/slave.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index d1a0a656b6b5..80be8e86c82d 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -736,6 +736,13 @@ static int dsa_slave_get_phys_port_name(struct net_device *dev, { struct dsa_port *dp = dsa_slave_to_port(dev); + /* For non-legacy ports, devlink is used and it takes + * care of the name generation. This ndo implementation + * should be removed with legacy support. + */ + if (dp->ds->devlink) + return -EOPNOTSUPP; + if (snprintf(name, len, "p%d", dp->index) >= len) return -EINVAL; -- 2.17.2