On 05/02/2011 04:50 PM, Kurt Van Dijck wrote: > RTR frames do have a valid data length code on CAN. > The driver for SJA1000 did not handle that situation properly.
Looks good! > > Signed-off-by: Kurt Van Dijck <[email protected]> Acked-by: Marc Kleine-Budde <[email protected]> > --- > drivers/net/can/sja1000/sja1000.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/can/sja1000/sja1000.c > b/drivers/net/can/sja1000/sja1000.c > index a358ea9..f501bba 100644 > --- a/drivers/net/can/sja1000/sja1000.c > +++ b/drivers/net/can/sja1000/sja1000.c > @@ -346,10 +346,10 @@ static void sja1000_rx(struct net_device *dev) > | (priv->read_reg(priv, REG_ID2) >> 5); > } > > + cf->can_dlc = get_can_dlc(fi & 0x0F); > if (fi & FI_RTR) { > id |= CAN_RTR_FLAG; > } else { > - cf->can_dlc = get_can_dlc(fi & 0x0F); > for (i = 0; i < cf->can_dlc; i++) > cf->data[i] = priv->read_reg(priv, dreg++); > } > _______________________________________________ > Socketcan-core mailing list > [email protected] > https://lists.berlios.de/mailman/listinfo/socketcan-core -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Socketcan-core mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-core
