Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

can: janz-ican3: cleanup of ican3_to_can_frame and can_frame_to_ican3

Browse source 
This patch cleans up the ICAN3 to Linux CAN frame and vice versa
conversion functions:

- RX: Use get_can_dlc() to limit the dlc value.
- RX+TX: Don't copy the whole frame, only copy the amount of bytes
  specified in cf->can_dlc.

Acked-by: Ira W. Snyder <iws@ovro.caltech.edu>
Tested-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2010-10-21 18:39:26 +02:00
parent 007890d726
commit 9e4d6909a2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/can/janz-ican3.c
View file

@ -811,10 +811,10 @@ static void ican3_to_can_frame(struct ican3_dev *mod,
cf->can_id |= desc->data[0] << 3; cf->can_id |= desc->data[0] << 3;
cf->can_id |= (desc->data[1] & 0xe0) >> 5; cf->can_id |= (desc->data[1] & 0xe0) >> 5;
cf->can_dlc = desc->data[1] & ICAN3_CAN_DLC_MASK; cf->can_dlc = get_can_dlc(desc->data[1] & ICAN3_CAN_DLC_MASK);
memcpy(cf->data, &desc->data[2], sizeof(cf->data)); memcpy(cf->data, &desc->data[2], cf->can_dlc);
} else { } else {
cf->can_dlc = desc->data[0] & ICAN3_CAN_DLC_MASK; cf->can_dlc = get_can_dlc(desc->data[0] & ICAN3_CAN_DLC_MASK);
if (desc->data[0] & ICAN3_EFF_RTR) if (desc->data[0] & ICAN3_EFF_RTR)
cf->can_id |= CAN_RTR_FLAG; cf->can_id |= CAN_RTR_FLAG;
@ -829,7 +829,7 @@ static void ican3_to_can_frame(struct ican3_dev *mod,
cf->can_id |= desc->data[3] >> 5; /* 2-0 */ cf->can_id |= desc->data[3] >> 5; /* 2-0 */
} }
memcpy(cf->data, &desc->data[6], sizeof(cf->data)); memcpy(cf->data, &desc->data[6], cf->can_dlc);
} }
} }
@ -861,7 +861,7 @@ static void can_frame_to_ican3(struct ican3_dev *mod,
} }
/* copy the data bits into the descriptor */ /* copy the data bits into the descriptor */
memcpy(&desc->data[6], cf->data, sizeof(cf->data)); memcpy(&desc->data[6], cf->data, cf->can_dlc);
} }
/* /*