The length of Remote Transmission Request (RTR) frames is always 0
bytes. The DLC represents the requested length, not the actual length
of the RTR. But __can_get_echo_skb() returns the DLC value regardless.

Apply get_can_len() function to retrieve the correct length.

Signed-off-by: Vincent Mailhol <mailhol.vinc...@wanadoo.fr>
---
 drivers/net/can/dev.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index e291fda395a0..8c3e11820e03 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -481,14 +481,9 @@ __can_get_echo_skb(struct net_device *dev, unsigned int 
idx, u8 *len_ptr)
        }
 
        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 canfd_frame *cf = (struct canfd_frame *)skb->data;
-               u8 len = cf->len;
 
-               *len_ptr = len;
+               *len_ptr = get_can_len(skb);
                priv->echo_skb[idx] = NULL;
 
                return skb;
-- 
2.26.2

Reply via email to