lkml.org 
[lkml]   [2021]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v2 4/5] can: do not increase rx_bytes statistics for RTR frames
From
Date
Hi Vincent,

On 25.11.21 18:20, Vincent Mailhol wrote:

> diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c
> index d582c39fc8d0..717d4925fdb0 100644
> --- a/drivers/net/can/usb/ucan.c
> +++ b/drivers/net/can/usb/ucan.c
> @@ -619,12 +619,13 @@ static void ucan_rx_can_msg(struct ucan_priv *up, struct ucan_message_in *m)
> /* copy the payload of non RTR frames */
> if (!(cf->can_id & CAN_RTR_FLAG) || (cf->can_id & CAN_ERR_FLAG))
> memcpy(cf->data, m->msg.can_msg.data, cf->len);
> + /* only frames which are neither RTR nor ERR have a payload */
> + else
> + stats->rx_bytes += cf->len;

This 'else' path looks wrong ...

>
> /* don't count error frames as real packets */
> - if (!(cf->can_id & CAN_ERR_FLAG)) {
> + if (!(cf->can_id & CAN_ERR_FLAG))
> stats->rx_packets++;
> - stats->rx_bytes += cf->len;
> - }
>
> /* pass it to Linux */
> netif_rx(skb);

Regards,
Oliver

\
 
 \ /
  Last update: 2021-11-25 19:52    [W:0.047 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site