devlink: move linecard struct into linecard.c

Instead of exposing linecard struct, expose a simple helper to get the
linecard index, which is all is needed outside linecard.c. Move the
linecard struct to linecard.c and keep it private similar to the rest of
the devlink objects.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index f6b5fea2e13cddfc8207a61aab3f6165db848621..1b05c2c09e27322c0c5a7e4034633d57aee48a07 100644 (file)
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -206,19 +206,7 @@ int devlink_rate_nodes_check(struct devlink *devlink, u16 mode,
                             struct netlink_ext_ack *extack);
 
 /* Linecards */
-struct devlink_linecard {
-       struct list_head list;
-       struct devlink *devlink;
-       unsigned int index;
-       const struct devlink_linecard_ops *ops;
-       void *priv;
-       enum devlink_linecard_state state;
-       struct mutex state_lock; /* Protects state */
-       const char *type;
-       struct devlink_linecard_type *types;
-       unsigned int types_count;
-       struct devlink *nested_devlink;
-};
+unsigned int devlink_linecard_index(struct devlink_linecard *linecard);
 
 /* Devlink nl cmds */
 int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info);

diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 85c32c314b0f9c19907c5c4d145f052f1c8c4268..a0210ba56f2def8190ec57796ae4e3103c346940 100644 (file)
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -6,6 +6,25 @@
 
 #include "devl_internal.h"
 
+struct devlink_linecard {
+       struct list_head list;
+       struct devlink *devlink;
+       unsigned int index;
+       const struct devlink_linecard_ops *ops;
+       void *priv;
+       enum devlink_linecard_state state;
+       struct mutex state_lock; /* Protects state */
+       const char *type;
+       struct devlink_linecard_type *types;
+       unsigned int types_count;
+       struct devlink *nested_devlink;
+};
+
+unsigned int devlink_linecard_index(struct devlink_linecard *linecard)
+{
+       return linecard->index;
+}
+
 static struct devlink_linecard *
 devlink_linecard_get_by_index(struct devlink *devlink,
                              unsigned int linecard_index)

diff --git a/net/devlink/port.c b/net/devlink/port.c
index 4763b42885fbd2541ce6ceb1cd8deab02657ff0c..7b300a322ed90a5ab45a00e09adc6d6e8eb98506 100644 (file)
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -483,7 +483,7 @@ static int devlink_nl_port_fill(struct sk_buff *msg,
                goto nla_put_failure;
        if (devlink_port->linecard &&
            nla_put_u32(msg, DEVLINK_ATTR_LINECARD_INDEX,
-                       devlink_port->linecard->index))
+                       devlink_linecard_index(devlink_port->linecard)))
                goto nla_put_failure;
 
        genlmsg_end(msg, hdr);
@@ -1420,7 +1420,7 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
        case DEVLINK_PORT_FLAVOUR_PHYSICAL:
                if (devlink_port->linecard)
                        n = snprintf(name, len, "l%u",
-                                    devlink_port->linecard->index);
+                                    devlink_linecard_index(devlink_port->linecard));
                if (n < len)
                        n += snprintf(name + n, len - n, "p%u",
                                      attrs->phys.port_number);