MIME-Version: 1.0
References: <20211125172021.976384-1-mailhol.vincent@wanadoo.fr>
 <20211125172021.976384-5-mailhol.vincent@wanadoo.fr> <ed755990-4169-604e-d982-7e4370114512@hartkopp.net>
In-Reply-To: <ed755990-4169-604e-d982-7e4370114512@hartkopp.net>
From:   Vincent MAILHOL <mailhol.vincent@wanadoo.fr>
Date:   Fri, 26 Nov 2021 08:28:56 +0900
Message-ID: <CAMZ6RqJWdO3tvOz020Ee_zcFnJDFWO9qxM7Rtjw2+n_o79B+cw@mail.gmail.com>
Subject: Re: [PATCH v2 4/5] can: do not increase rx_bytes statistics for RTR frames
To:     Oliver Hartkopp <socketcan@hartkopp.net>
Cc:     Marc Kleine-Budde <mkl@pengutronix.de>, linux-can@vger.kernel.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev,
        Jimmy Assarsson <extja@kvaser.com>,
        Nicolas Ferre <nicolas.ferre@microchip.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Ludovic Desroches <ludovic.desroches@microchip.com>,
        Chandrasekar Ramakrishnan <rcsekar@samsung.com>,
        Maxime Ripard <mripard@kernel.org>,
        Chen-Yu Tsai <wens@csie.org>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Yasushi SHOJI <yashi@spacecubics.com>,
        Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>,
        Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>,
        Michal Simek <michal.simek@xilinx.com>,
        Stephane Grosjean <s.grosjean@peak-system.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Hi Oliver,

On. 26 Nov. 2021 at 03:50, Oliver Hartkopp <socketcan@hartkopp.net> wrote:
> 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 ...

Ack. I will send a v3.
And thanks a lot for the review!

> >
> >       /* 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