Skip to content

Commit

Permalink
devlink: Move netdev_to_devlink helpers to devlink.c
Browse files Browse the repository at this point in the history
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: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Leon Romanovsky authored and Jakub Kicinski committed Oct 12, 2021
1 parent 2131463 commit 2bc5098
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
17 changes: 0 additions & 17 deletions include/net/devlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -1486,23 +1486,6 @@ void *devlink_priv(struct devlink *devlink);
struct devlink *priv_to_devlink(void *priv);
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 net *devlink_net(const struct devlink *devlink);
Expand Down
18 changes: 18 additions & 0 deletions net/core/devlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -11381,6 +11381,24 @@ static void __devlink_compat_running_version(struct devlink *devlink,
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,
char *buf, size_t len)
{
Expand Down

0 comments on commit 2bc5098

Please sign in to comment.