diff options
| author | Marc Kleine-Budde | 2018-10-31 11:08:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-12-01 09:37:29 +0100 |
| commit | cfc8ed910312c97fbf7ddf3fca8e65cb76894fa5 (patch) | |
| tree | dd7ae0316e2150911d445f6ca2f338a172257b3a | |
| parent | can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_s... (diff) | |
| download | kernel-qcow2-linux-cfc8ed910312c97fbf7ddf3fca8e65cb76894fa5.tar.gz kernel-qcow2-linux-cfc8ed910312c97fbf7ddf3fca8e65cb76894fa5.tar.xz kernel-qcow2-linux-cfc8ed910312c97fbf7ddf3fca8e65cb76894fa5.zip | |
can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length
commit 200f5c49f7a2cd694436bfc6cb0662b794c96736 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/can/dev.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 80530ab37b1e..46cc5fec4043 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -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; |