Re: [PATCH] can: sja1000: Fix error location forwarding

[Oliver Hartkopp <socketcan@hartkopp.net>]

Hello Alexander,

you are right. Thanks for the fix.

On 04/01/2016 06:16 PM, Alexander Gerasiov wrote:
> According to SJA1000 documentation the location of error is available
> regardless of an error type. Therefore it should always be forwarded to
> SocketCAN.
> 
> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@lvk.cs.msu.su>
> Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>

Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Best regards,
Oliver

> ---
>  drivers/net/can/sja1000/sja1000.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
> index 8dda3b7..9f10779 100644
> --- a/drivers/net/can/sja1000/sja1000.c
> +++ b/drivers/net/can/sja1000/sja1000.c
> @@ -438,6 +438,7 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
>  
>                 cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;
>  
> +               /* set error type */
>                 switch (ecc & ECC_MASK) {
>                 case ECC_BIT:
>                         cf->data[2] |= CAN_ERR_PROT_BIT;
> @@ -449,9 +450,12 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
>                         cf->data[2] |= CAN_ERR_PROT_STUFF;
>                         break;
>                 default:
> -                       cf->data[3] = ecc & ECC_SEG;
>                         break;
>                 }
> +
> +               /* set error location */
> +               cf->data[3] = ecc & ECC_SEG;
> +
>                 /* Error occurred during transmission? */
>                 if ((ecc & ECC_DIR) == 0)
>                         cf->data[2] |= CAN_ERR_PROT_TX;
>