Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 16 Jun 2021 16:46:40 +0200
From:   Marc Kleine-Budde <mkl@pengutronix.de>
To:     Vincent MAILHOL <mailhol.vincent@wanadoo.fr>
Cc:     linux-can <linux-can@vger.kernel.org>,
        netdev <netdev@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        Oliver Hartkopp <socketcan@hartkopp.net>
Subject: Re: [PATCH v2 2/2] can: netlink: add interface for CAN-FD
 Transmitter Delay Compensation (TDC)
Message-ID: <20210616144640.l4hjc6mc3ndw25hj@pengutronix.de>
References: <20210603151550.140727-1-mailhol.vincent@wanadoo.fr>
 <20210603151550.140727-3-mailhol.vincent@wanadoo.fr>
 <20210616094633.fwg6rsyxyvm2zc6d@pengutronix.de>
 <CAMZ6RqLj59+3PrQwTCfK_bVebRBHE=HqCfRb31MU9pRDBPxG8w@mail.gmail.com>
 <20210616142940.wxllr3c55rk66rij@pengutronix.de>
 <CAMZ6RqJWeexWTGVkEJWMvBs1f=HQOc4zjd-PqPsxKnCr_XDFZQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="yfgh76m5lrylc5pl"
Content-Disposition: inline
In-Reply-To: <CAMZ6RqJWeexWTGVkEJWMvBs1f=HQOc4zjd-PqPsxKnCr_XDFZQ@mail.gmail.com>
Precedence: bulk


--yfgh76m5lrylc5pl
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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/netl=
ink.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_d=
evice *dev)
> > |         size +=3D nla_total_size(sizeof(u32));            /* IFLA_CAN=
_TDCO_MAX */
> > |         size +=3D nla_total_size(sizeof(u32));            /* IFLA_CAN=
_TDCF_MAX */
> > |
> > | -       if (priv->tdc.tdco) {
> > | +       if (can_tdc_is_enabled(priv)) {
> > |                 size +=3D nla_total_size(sizeof(u32));    /* IFLA_CAN=
_TDCV */
> > |                 size +=3D nla_total_size(sizeof(u32));    /* IFLA_CAN=
_TDCO */
> > |                 size +=3D nla_total_size(sizeof(u32));    /* IFLA_CAN=
_TDCF */
> > | @@ -352,6 +352,7 @@ static size_t can_get_size(const struct net_devic=
e *dev)
> > |                                        priv->data_bitrate_const_cnt);
> > |         size +=3D sizeof(priv->bitrate_max);                      /* =
IFLA_CAN_BITRATE_MAX */
> > |         size +=3D 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_m=
ax))
> > |                 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/bittim=
ing.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)
>=20
> 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

--=20
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 |

--yfgh76m5lrylc5pl
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEK3kIWJt9yTYMP3ehqclaivrt76kFAmDKDs0ACgkQqclaivrt
76nmKgf+JKGqznOyIg4hPJil6qfsqgmZnRQEiy1rkwKYNbOwYXLuiFr4vf6g1H1l
r0vYi80+78mcIIlqpBGirsKB3WX993WpfLDmPnvM+vB/CV+kxmKu4gQWOr0MRMpY
QNj7qb8w3zkc1gFm6nMXWxOqXPDBPaPFEGdfF8khYzs8xJ3UUNrUhWS5KQvA1wjg
ru05plLZqUIR6qvQCcefdguE/owCLYNxf9hBsfIJc5M6Os8XmB/NO/W/FQ7pPS4p
D0dLB6v2jH1v71XjvrYbxqGFMG96PY6YOoqdYRKkFrGj4q/989A66R3jQ4VNQZgz
bKLdR+AniFa7sBGpB7b0jXgLzeSL1w==
=NYU/
-----END PGP SIGNATURE-----

--yfgh76m5lrylc5pl--