Commit 2bc50987 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jakub Kicinski

devlink: Move netdev_to_devlink helpers to devlink.c

Both netdev_to_devlink and netdev_to_devlink_port are used in devlink.c
only, so move them in order to reduce their scope.
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 21314638
...@@ -1486,23 +1486,6 @@ void *devlink_priv(struct devlink *devlink); ...@@ -1486,23 +1486,6 @@ void *devlink_priv(struct devlink *devlink);
struct devlink *priv_to_devlink(void *priv); struct devlink *priv_to_devlink(void *priv);
struct device *devlink_to_dev(const struct devlink *devlink); struct device *devlink_to_dev(const struct devlink *devlink);
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)
{
struct devlink_port *devlink_port = netdev_to_devlink_port(dev);
if (devlink_port)
return devlink_port->devlink;
return NULL;
}
struct ib_device; struct ib_device;
struct net *devlink_net(const struct devlink *devlink); struct net *devlink_net(const struct devlink *devlink);
......
...@@ -11381,6 +11381,24 @@ static void __devlink_compat_running_version(struct devlink *devlink, ...@@ -11381,6 +11381,24 @@ static void __devlink_compat_running_version(struct devlink *devlink,
nlmsg_free(msg); nlmsg_free(msg);
} }
static struct devlink_port *netdev_to_devlink_port(struct net_device *dev)
{
if (!dev->netdev_ops->ndo_get_devlink_port)
return NULL;
return dev->netdev_ops->ndo_get_devlink_port(dev);
}
static struct devlink *netdev_to_devlink(struct net_device *dev)
{
struct devlink_port *devlink_port = netdev_to_devlink_port(dev);
if (!devlink_port)
return NULL;
return devlink_port->devlink;
}
void devlink_compat_running_version(struct net_device *dev, void devlink_compat_running_version(struct net_device *dev,
char *buf, size_t len) char *buf, size_t len)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment