Skip to content

Commit 530c918

Browse files
vincent-mailholmarckleinebudde
authored andcommitted
can: netlink: make can_tdc_changelink() FD agnostic
can_tdc_changelink() needs to access can_priv->fd making it specific to CAN FD. Change the function parameter from struct can_priv to struct data_bittiming_params. This way, the function becomes CAN FD agnostic and can be reused later on for the CAN XL TDC. Signed-off-by: Vincent Mailhol <mailhol@kernel.org> Link: https://patch.msgid.link/20250923-canxl-netlink-prep-v4-9-e720d28f66fe@kernel.org Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 2b0a693 commit 530c918

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/net/can/dev/netlink.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,13 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
172172
return 0;
173173
}
174174

175-
static int can_tdc_changelink(struct can_priv *priv, const struct nlattr *nla,
175+
static int can_tdc_changelink(struct data_bittiming_params *dbt_params,
176+
const struct nlattr *nla,
176177
struct netlink_ext_ack *extack)
177178
{
178179
struct nlattr *tb_tdc[IFLA_CAN_TDC_MAX + 1];
179180
struct can_tdc tdc = { 0 };
180-
const struct can_tdc_const *tdc_const = priv->fd.tdc_const;
181+
const struct can_tdc_const *tdc_const = dbt_params->tdc_const;
181182
int err;
182183

183184
if (!tdc_const)
@@ -215,7 +216,7 @@ static int can_tdc_changelink(struct can_priv *priv, const struct nlattr *nla,
215216
tdc.tdcf = tdcf;
216217
}
217218

218-
priv->fd.tdc = tdc;
219+
dbt_params->tdc = tdc;
219220

220221
return 0;
221222
}
@@ -382,8 +383,8 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
382383
memset(&priv->fd.tdc, 0, sizeof(priv->fd.tdc));
383384
if (data[IFLA_CAN_TDC]) {
384385
/* TDC parameters are provided: use them */
385-
err = can_tdc_changelink(priv, data[IFLA_CAN_TDC],
386-
extack);
386+
err = can_tdc_changelink(&priv->fd,
387+
data[IFLA_CAN_TDC], extack);
387388
if (err) {
388389
priv->ctrlmode &= ~CAN_CTRLMODE_FD_TDC_MASK;
389390
return err;

0 commit comments

Comments
 (0)