can: netlink: add can_bittiming_fill_info()

Add can_bittiming_fill_info() to factorise the logic when filling the
bittiming information for Classical CAN and CAN FD. This function will
be reused later on for CAN XL.

Signed-off-by: Vincent Mailhol <mailhol@kernel.org>
Link: https://patch.msgid.link/20250923-canxl-netlink-prep-v4-14-e720d28f66fe@kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
index 5d2b524daea90442e56a1b24e7c32190a84ed934..bedd2611d35852e3e1e8b63aa418726a5675897d 100644 (file)
--- a/drivers/net/can/dev/netlink.c
+++ b/drivers/net/can/dev/netlink.c
@@ -559,6 +559,14 @@ static size_t can_get_size(const struct net_device *dev)
        return size;
 }
 
+static int can_bittiming_fill_info(struct sk_buff *skb, int ifla_can_bittiming,
+                                  struct can_bittiming *bittiming)
+{
+       return bittiming->bitrate != CAN_BITRATE_UNSET &&
+               bittiming->bitrate != CAN_BITRATE_UNKNOWN &&
+               nla_put(skb, ifla_can_bittiming, sizeof(*bittiming), bittiming);
+}
+
 static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev)
 {
        struct nlattr *nest;
@@ -641,10 +649,8 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
        if (priv->do_get_state)
                priv->do_get_state(dev, &state);
 
-       if ((priv->bittiming.bitrate != CAN_BITRATE_UNSET &&
-            priv->bittiming.bitrate != CAN_BITRATE_UNKNOWN &&
-            nla_put(skb, IFLA_CAN_BITTIMING,
-                    sizeof(priv->bittiming), &priv->bittiming)) ||
+       if (can_bittiming_fill_info(skb, IFLA_CAN_BITTIMING,
+                                   &priv->bittiming) ||
 
            (priv->bittiming_const &&
             nla_put(skb, IFLA_CAN_BITTIMING_CONST,
@@ -659,9 +665,8 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
             !priv->do_get_berr_counter(dev, &bec) &&
             nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec)) ||
 
-           (priv->fd.data_bittiming.bitrate &&
-            nla_put(skb, IFLA_CAN_DATA_BITTIMING,
-                    sizeof(priv->fd.data_bittiming), &priv->fd.data_bittiming)) ||
+           can_bittiming_fill_info(skb, IFLA_CAN_DATA_BITTIMING,
+                                   &priv->fd.data_bittiming) ||
 
            (priv->fd.data_bittiming_const &&
             nla_put(skb, IFLA_CAN_DATA_BITTIMING_CONST,