lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 137/389] can: kvaser_usb_leaf: do not report txerr and rxerr during bus-off
    Date
    From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>

    [ Upstream commit a57732084e06791d37ea1ea447cca46220737abd ]

    During bus off, the error count is greater than 255 and can not fit in
    a u8.

    Fixes: 7259124eac7d1 ("can: kvaser_usb: Split driver into kvaser_usb_core.c and kvaser_usb_leaf.c")
    Link: https://lore.kernel.org/all/20220719143550.3681-9-mailhol.vincent@wanadoo.fr
    CC: Jimmy Assarsson <extja@kvaser.com>
    Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    index 0e0403dd0550..5e281249ad5f 100644
    --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
    @@ -857,8 +857,10 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,
    break;
    }

    - cf->data[6] = es->txerr;
    - cf->data[7] = es->rxerr;
    + if (new_state != CAN_STATE_BUS_OFF) {
    + cf->data[6] = es->txerr;
    + cf->data[7] = es->rxerr;
    + }

    stats->rx_packets++;
    stats->rx_bytes += cf->can_dlc;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-23 13:30    [W:4.027 / U:1.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site