On 16.06.2021 23:43:35, Vincent MAILHOL wrote:
> > Sounds good, I'm squashing this patch:
> >
> > | diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
> > | index 6134bbf69c10..d48be574eae7 100644
> > | --- a/drivers/net/can/dev/netlink.c
> > | +++ b/drivers/net/can/dev/netlink.c
> > | @@ -311,7 +311,7 @@ static size_t can_tdc_get_size(const struct net_device *dev)
> > | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_TDCO_MAX */
> > | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_TDCF_MAX */
> > |
> > | - if (priv->tdc.tdco) {
> > | + if (can_tdc_is_enabled(priv)) {
> > | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_TDCV */
> > | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_TDCO */
> > | size += nla_total_size(sizeof(u32)); /* IFLA_CAN_TDCF */
> > | @@ -352,6 +352,7 @@ static size_t can_get_size(const struct net_device *dev)
> > | priv->data_bitrate_const_cnt);
> > | size += sizeof(priv->bitrate_max); /* IFLA_CAN_BITRATE_MAX */
> > | size += can_tdc_get_size(dev); /* IFLA_CAN_TDC */
> > | +
> > | return size;
> > | }
> > |
> > | @@ -374,7 +375,7 @@ static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev)
> > | nla_put_u32(skb, IFLA_CAN_TDC_TDCF_MAX, tdc_const->tdcf_max))
> > | goto err_cancel;
> > |
> > | - if (priv->tdc.tdco)
> > | + if (can_tdc_is_enabled(priv)) {
> > | if (nla_put_u32(skb, IFLA_CAN_TDC_TDCV, tdc->tdcv) ||
> > | nla_put_u32(skb, IFLA_CAN_TDC_TDCO, tdc->tdco) ||
> > | nla_put_u32(skb, IFLA_CAN_TDC_TDCF, tdc->tdcf))
> > | diff --git a/include/linux/can/bittiming.h b/include/linux/can/bittiming.h
> > | index 9de6e9053e34..b6d1db1e7258 100644
> > | --- a/include/linux/can/bittiming.h
> > | +++ b/include/linux/can/bittiming.h
> > | @@ -83,6 +83,11 @@ struct can_tdc_const {
> > | u32 tdcf_max;
> > | };
> > |
> > | +static inline bool can_tdc_is_enabled(const struct can_priv *priv)
>
> Did you try to compile?
Not before sending that mail :)
> I am not sure if bittiming.h is able to see struct can_priv which is
> defined in dev.h.
Nope it doesn't, I moved the can_tdc_is_enabled() to
include/linux/can/dev.h
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: PGP signature
