diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2019-03-28 13:56:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-28 20:55:30 +0100 |
| commit | 5dc37bb9b03586e8fdeb47d25e8d2a0399984936 (patch) | |
| tree | 4c408fd86a16015ff52f936aa8bf393212a8ca3b /include/net | |
| parent | nfp: register devlink port before netdev (diff) | |
| download | linux-5dc37bb9b03586e8fdeb47d25e8d2a0399984936.tar.xz linux-5dc37bb9b03586e8fdeb47d25e8d2a0399984936.zip | |
net: replace ndo_get_devlink with ndo_get_devlink_port
Follow-up patch is going to need a devlink port instance according to
a netdev. Devlink port instance should be always available when devlink
is used. So change the recently introduced ndo_get_devlink to
ndo_get_devlink_port. With that, adjust the wrapper for the only
user to get devlink pointer.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/devlink.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/net/devlink.h b/include/net/devlink.h index 03fb16f4fb6c..81b5ed04a341 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -547,10 +547,20 @@ static inline struct devlink *priv_to_devlink(void *priv) return container_of(priv, struct devlink, priv); } +static inline struct devlink_port * +netdev_to_devlink_port(struct net_device *dev) +{ + if (dev->netdev_ops->ndo_get_devlink_port) + return dev->netdev_ops->ndo_get_devlink_port(dev); + return NULL; +} + static inline struct devlink *netdev_to_devlink(struct net_device *dev) { - if (dev->netdev_ops->ndo_get_devlink) - return dev->netdev_ops->ndo_get_devlink(dev); + struct devlink_port *devlink_port = netdev_to_devlink_port(dev); + + if (devlink_port) + return devlink_port->devlink; return NULL; } |