diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2019-03-28 13:56:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-28 12:55:30 -0700 |
| commit | af3836df9a59e7339d60c9c46729a7d9094d0582 (patch) | |
| tree | 739ad2a6a871e9ca4fc7bf814b5659f5d82343d8 /net/core/dev.c | |
| parent | 5dc37bb9b03586e8fdeb47d25e8d2a0399984936 (diff) | |
| download | lwn-af3836df9a59e7339d60c9c46729a7d9094d0582.tar.gz lwn-af3836df9a59e7339d60c9c46729a7d9094d0582.zip | |
net: devlink: introduce devlink_compat_phys_port_name_get()
Introduce devlink_compat_phys_port_name_get() helper that
gets the physical port name for specified netdevice
according to devlink port attributes.
Call this helper from dev_get_phys_port_name()
in case ndo_get_phys_port_name is not defined.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9ca2d3abfd1a..9823b7713f79 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -146,6 +146,7 @@ #include <net/udp_tunnel.h> #include <linux/net_namespace.h> #include <linux/indirect_call_wrapper.h> +#include <net/devlink.h> #include "net-sysfs.h" @@ -7877,10 +7878,14 @@ int dev_get_phys_port_name(struct net_device *dev, char *name, size_t len) { const struct net_device_ops *ops = dev->netdev_ops; + int err; - if (!ops->ndo_get_phys_port_name) - return -EOPNOTSUPP; - return ops->ndo_get_phys_port_name(dev, name, len); + if (ops->ndo_get_phys_port_name) { + err = ops->ndo_get_phys_port_name(dev, name, len); + if (err != -EOPNOTSUPP) + return err; + } + return devlink_compat_phys_port_name_get(dev, name, len); } EXPORT_SYMBOL(dev_get_phys_port_name); |