From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Oliver Hartkopp <socketcan@hartkopp.net>, linux-can@vger.kernel.org
Cc: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Subject: Re: [PATCH RFC] can-dev: fix real payload length return value for RTR frames
Date: Tue, 20 Oct 2020 09:07:45 +0200 [thread overview]
Message-ID: <0e382596-9f05-5af7-e2bb-4d74c507eabb@pengutronix.de> (raw)
In-Reply-To: <20201020064443.80164-1-socketcan@hartkopp.net>
[-- Attachment #1.1: Type: text/plain, Size: 1857 bytes --]
On 10/20/20 8:44 AM, Oliver Hartkopp wrote:
> The can_get_echo_skb() function returns the number of received bytes to
> be used for netdev statistics. In the case of RTR frames we get a valid
> (potential non-zero) data length value which has to be passed for further
> operations. But on the wire RTR frames have no payload length. Therefore
> the value to be used in the statistics has to be zero for RTR frames.
>
> Reported-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> Link: https://lore.kernel.org/r/20201002154219.4887-4-mailhol.vincent@wanadoo.fr
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> ---
> drivers/net/can/dev.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
> index b70ded3760f2..64c8cb27154b 100644
> --- a/drivers/net/can/dev.c
> +++ b/drivers/net/can/dev.c
> @@ -510,13 +510,17 @@ __can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr)
> /* Using "struct canfd_frame::len" for the frame
> * length is supported on both CAN and CANFD frames.
> */
> struct sk_buff *skb = priv->echo_skb[idx];
> struct canfd_frame *cf = (struct canfd_frame *)skb->data;
> - u8 len = cf->len;
>
> - *len_ptr = len;
> + /* get the real payload length for netdev statistics */
> + if (cf->can_id & CAN_RTR_FLAG)
> + *len_ptr = 0;
> + else
> + *len_ptr = cf->len;
> +
> priv->echo_skb[idx] = NULL;
>
> return skb;
> }
Looks good. I've replaced patches 4 and 5 by this one.
tnx,
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-10-20 7:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 6:44 [PATCH RFC] can-dev: fix real payload length return value for RTR frames Oliver Hartkopp
2020-10-20 7:07 ` Marc Kleine-Budde [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0e382596-9f05-5af7-e2bb-4d74c507eabb@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=socketcan@hartkopp.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).