Skip to content

Commit e1a2be5

Browse files
vincent-mailholmarckleinebudde
authored andcommitted
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>
1 parent d5f45ef commit e1a2be5

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

drivers/net/can/dev/netlink.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,14 @@ static size_t can_get_size(const struct net_device *dev)
559559
return size;
560560
}
561561

562+
static int can_bittiming_fill_info(struct sk_buff *skb, int ifla_can_bittiming,
563+
struct can_bittiming *bittiming)
564+
{
565+
return bittiming->bitrate != CAN_BITRATE_UNSET &&
566+
bittiming->bitrate != CAN_BITRATE_UNKNOWN &&
567+
nla_put(skb, ifla_can_bittiming, sizeof(*bittiming), bittiming);
568+
}
569+
562570
static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev)
563571
{
564572
struct nlattr *nest;
@@ -641,10 +649,8 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
641649
if (priv->do_get_state)
642650
priv->do_get_state(dev, &state);
643651

644-
if ((priv->bittiming.bitrate != CAN_BITRATE_UNSET &&
645-
priv->bittiming.bitrate != CAN_BITRATE_UNKNOWN &&
646-
nla_put(skb, IFLA_CAN_BITTIMING,
647-
sizeof(priv->bittiming), &priv->bittiming)) ||
652+
if (can_bittiming_fill_info(skb, IFLA_CAN_BITTIMING,
653+
&priv->bittiming) ||
648654

649655
(priv->bittiming_const &&
650656
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)
659665
!priv->do_get_berr_counter(dev, &bec) &&
660666
nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec)) ||
661667

662-
(priv->fd.data_bittiming.bitrate &&
663-
nla_put(skb, IFLA_CAN_DATA_BITTIMING,
664-
sizeof(priv->fd.data_bittiming), &priv->fd.data_bittiming)) ||
668+
can_bittiming_fill_info(skb, IFLA_CAN_DATA_BITTIMING,
669+
&priv->fd.data_bittiming) ||
665670

666671
(priv->fd.data_bittiming_const &&
667672
nla_put(skb, IFLA_CAN_DATA_BITTIMING_CONST,

0 commit comments

Comments
 (0)