On Thu, Oct 21, 2010 at 07:53:32PM +0200, Marc Kleine-Budde wrote:
> Signed-off-by: Marc Kleine-Budde <[email protected]>
> Cc: Ira W. Snyder <[email protected]>
> ---
Looks good. Please add my Acked-by.
Thanks,
Ira
> drivers/net/can/janz-ican3.c | 19 ++++++++++---------
> 1 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
> index 7416f25..8715162 100644
> --- a/drivers/net/can/janz-ican3.c
> +++ b/drivers/net/can/janz-ican3.c
> @@ -807,18 +807,15 @@ static void ican3_to_can_frame(struct ican3_dev *mod,
> struct can_frame *cf)
> {
> if ((desc->command & ICAN3_CAN_TYPE_MASK) == ICAN3_CAN_TYPE_SFF) {
> - if (desc->data[1] & ICAN3_SFF_RTR)
> - cf->can_id |= CAN_RTR_FLAG;
> -
> cf->can_id |= desc->data[0] << 3;
> cf->can_id |= (desc->data[1] & 0xe0) >> 5;
> +
> cf->can_dlc = get_can_dlc(desc->data[1] & ICAN3_CAN_DLC_MASK);
> - memcpy(cf->data, &desc->data[2], cf->can_dlc);
> - } else {
> - cf->can_dlc = get_can_dlc(desc->data[0] & ICAN3_CAN_DLC_MASK);
> - if (desc->data[0] & ICAN3_EFF_RTR)
> + if (desc->data[1] & ICAN3_SFF_RTR)
> cf->can_id |= CAN_RTR_FLAG;
> -
> + else
> + memcpy(cf->data, &desc->data[2], cf->can_dlc);
> + } else {
> if (desc->data[0] & ICAN3_EFF) {
> cf->can_id |= CAN_EFF_FLAG;
> cf->can_id |= desc->data[2] << 21; /* 28-21 */
> @@ -830,7 +827,11 @@ static void ican3_to_can_frame(struct ican3_dev *mod,
> cf->can_id |= desc->data[3] >> 5; /* 2-0 */
> }
>
> - memcpy(cf->data, &desc->data[6], cf->can_dlc);
> + cf->can_dlc = get_can_dlc(desc->data[0] & ICAN3_CAN_DLC_MASK);
> + if (desc->data[0] & ICAN3_EFF_RTR)
> + cf->can_id |= CAN_RTR_FLAG;
> + else
> + memcpy(cf->data, &desc->data[6], cf->can_dlc);
> }
> }
>
> --
> 1.7.0.4
>
_______________________________________________
Socketcan-core mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/socketcan-core
