lkml.org 
[lkml]   [2017]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 129/204] can: esd_usb2: Fix can_dlc value for received RTR, frames
    3.16.52-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Mätje <Stefan.Maetje@esd.eu>

    commit 72d92e865d1560723e1957ee3f393688c49ca5bf upstream.

    The dlc member of the struct rx_msg contains also the ESD_RTR flag to
    mark received RTR frames. Without the fix the can_dlc value for received
    RTR frames would always be set to 8 by get_can_dlc() instead of the
    received value.

    Fixes: 96d8e90382dc ("can: Add driver for esd CAN-USB/2 device")
    Signed-off-by: Stefan Mätje <stefan.maetje@esd.eu>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/can/usb/esd_usb2.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/can/usb/esd_usb2.c
    +++ b/drivers/net/can/usb/esd_usb2.c
    @@ -334,7 +334,7 @@ static void esd_usb2_rx_can_msg(struct e
    }

    cf->can_id = id & ESD_IDMASK;
    - cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);
    + cf->can_dlc = get_can_dlc(msg->msg.rx.dlc & ~ESD_RTR);

    if (id & ESD_EXTID)
    cf->can_id |= CAN_EFF_FLAG;
    \
     
     \ /
      Last update: 2017-12-28 18:35    [W:2.453 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site