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>
This commit is contained in:

committed by
David S. Miller

parent
335bc0dde0
commit
5dc37bb9b0
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user