Skip to content

Commit d5ee934

Browse files
vincent-mailholmarckleinebudde
authored andcommitted
can: netlink: add can_bitrate_const_fill_info()
Add can_bitrate_const_fill_info() to factorise the logic when filling the bitrate constant information for Classical CAN and CAN FD. This function will be reused later on for CAN XL. Signed-off-by: Vincent Mailhol <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent aaeebdb commit d5ee934

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

drivers/net/can/dev/netlink.c

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,15 @@ static int can_bittiming_const_fill_info(struct sk_buff *skb,
576576
sizeof(*bittiming_const), bittiming_const);
577577
}
578578

579+
static int can_bitrate_const_fill_info(struct sk_buff *skb,
580+
int ifla_can_bitrate_const,
581+
const u32 *bitrate_const, unsigned int cnt)
582+
{
583+
return bitrate_const &&
584+
nla_put(skb, ifla_can_bitrate_const,
585+
sizeof(*bitrate_const) * cnt, bitrate_const);
586+
}
587+
579588
static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev)
580589
{
581590
struct nlattr *nest;
@@ -686,17 +695,13 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
686695
priv->termination_const_cnt,
687696
priv->termination_const))) ||
688697

689-
(priv->bitrate_const &&
690-
nla_put(skb, IFLA_CAN_BITRATE_CONST,
691-
sizeof(*priv->bitrate_const) *
692-
priv->bitrate_const_cnt,
693-
priv->bitrate_const)) ||
694-
695-
(priv->fd.data_bitrate_const &&
696-
nla_put(skb, IFLA_CAN_DATA_BITRATE_CONST,
697-
sizeof(*priv->fd.data_bitrate_const) *
698-
priv->fd.data_bitrate_const_cnt,
699-
priv->fd.data_bitrate_const)) ||
698+
can_bitrate_const_fill_info(skb, IFLA_CAN_BITRATE_CONST,
699+
priv->bitrate_const,
700+
priv->bitrate_const_cnt) ||
701+
702+
can_bitrate_const_fill_info(skb, IFLA_CAN_DATA_BITRATE_CONST,
703+
priv->fd.data_bitrate_const,
704+
priv->fd.data_bitrate_const_cnt) ||
700705

701706
(nla_put(skb, IFLA_CAN_BITRATE_MAX,
702707
sizeof(priv->bitrate_max),

0 commit comments

Comments
 (0)