Skip to content

Commit

Permalink
can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_fra…
Browse files Browse the repository at this point in the history
…me to access frame length

This patch replaces the use of "struct can_frame::can_dlc" by "struct
canfd_frame::len" to access the frame's length. As it is ensured that
both structures have a compatible memory layout for this member this is
no functional change. Futher, this compatibility is documented in a
comment.

Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
marckleinebudde committed Nov 9, 2018
1 parent a4310fa commit 200f5c4
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions drivers/net/can/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -484,11 +484,14 @@ struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8
BUG_ON(idx >= priv->echo_skb_max);

if (priv->echo_skb[idx]) {
/* Using "struct canfd_frame::len" for the frame
* length is supported on both CAN and CANFD frames.
*/
struct sk_buff *skb = priv->echo_skb[idx];
struct can_frame *cf = (struct can_frame *)skb->data;
u8 dlc = cf->can_dlc;
struct canfd_frame *cf = (struct canfd_frame *)skb->data;
u8 len = cf->len;

*len_ptr = dlc;
*len_ptr = len;
priv->echo_skb[idx] = NULL;

return skb;
Expand Down

0 comments on commit 200f5c4

Please sign in to comment.