Skip to content

Commit aaeebdb

Browse files
vincent-mailholmarckleinebudde
authored andcommitted
can: netlink: add can_bittiming_const_fill_info()
Add function can_bittiming_const_fill_info() to factorise the logic when filling the bittiming 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 e1a2be5 commit aaeebdb

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

drivers/net/can/dev/netlink.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,15 @@ static int can_bittiming_fill_info(struct sk_buff *skb, int ifla_can_bittiming,
567567
nla_put(skb, ifla_can_bittiming, sizeof(*bittiming), bittiming);
568568
}
569569

570+
static int can_bittiming_const_fill_info(struct sk_buff *skb,
571+
int ifla_can_bittiming_const,
572+
const struct can_bittiming_const *bittiming_const)
573+
{
574+
return bittiming_const &&
575+
nla_put(skb, ifla_can_bittiming_const,
576+
sizeof(*bittiming_const), bittiming_const);
577+
}
578+
570579
static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev)
571580
{
572581
struct nlattr *nest;
@@ -652,9 +661,8 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
652661
if (can_bittiming_fill_info(skb, IFLA_CAN_BITTIMING,
653662
&priv->bittiming) ||
654663

655-
(priv->bittiming_const &&
656-
nla_put(skb, IFLA_CAN_BITTIMING_CONST,
657-
sizeof(*priv->bittiming_const), priv->bittiming_const)) ||
664+
can_bittiming_const_fill_info(skb, IFLA_CAN_BITTIMING_CONST,
665+
priv->bittiming_const) ||
658666

659667
nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock) ||
660668
nla_put_u32(skb, IFLA_CAN_STATE, state) ||
@@ -668,10 +676,8 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
668676
can_bittiming_fill_info(skb, IFLA_CAN_DATA_BITTIMING,
669677
&priv->fd.data_bittiming) ||
670678

671-
(priv->fd.data_bittiming_const &&
672-
nla_put(skb, IFLA_CAN_DATA_BITTIMING_CONST,
673-
sizeof(*priv->fd.data_bittiming_const),
674-
priv->fd.data_bittiming_const)) ||
679+
can_bittiming_const_fill_info(skb, IFLA_CAN_DATA_BITTIMING_CONST,
680+
priv->fd.data_bittiming_const) ||
675681

676682
(priv->termination_const &&
677683
(nla_put_u16(skb, IFLA_CAN_TERMINATION, priv->termination) ||

0 commit comments

Comments
 (0)