On Fri. 19 mars 2021 at 23:27, Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> wrote:
> In order to implement byte queue limits (bql) in CAN drivers, the
> length of the CAN frame needs to be passed into the networking stack
> even if the transmission failed for some reason.
>
> To avoid to calculate this length twice, extend can_free_echo_skb() to
> return that value. Convert all users of this function, too.
>
> This patch is the natural extension of commit:
>
> | 9420e1d495e2 ("can: dev: can_get_echo_skb(): extend to return can
> | frame length")
>
> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
[...]
> diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c
> index 95d0a02e408b..724ba72237dc 100644
> --- a/drivers/net/can/usb/etas_es58x/es58x_core.c
> +++ b/drivers/net/can/usb/etas_es58x/es58x_core.c
> @@ -314,7 +314,7 @@ static void es58x_can_free_echo_skb_tail(struct net_device *netdev)
> struct sk_buff *skb = priv->can.echo_skb[priv->tx_tail & fifo_mask];
>
> netdev_completed_queue(netdev, 1, can_skb_prv(skb)->frame_len);
> - can_free_echo_skb(netdev, priv->tx_tail & fifo_mask);
> + can_free_echo_skb(netdev, priv->tx_tail & fifo_mask, NULL);
Do you already have the etas_es58x driver in can-next/testing?
Or were you working on the wrong branch?
Could you push the last version of can-next/testing? It would be easier for me.
Yours sincerely,
Vincent
