Commit 9420e1d4 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: dev: can_get_echo_skb(): extend to return can frame length 



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 after queueing and after
transmission completion.

To avoid to calculate this length twice, extend can_get_echo_skb() to return
that value. Convert all users of this function, too.

Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20210111141930.693847-14-mkl@pengutronix.de


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 1dcb6e57

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static void at91_irq_tx(struct net_device *dev, u32 reg_sr) 
		if (likely(reg_msr & AT91_MSR_MRDY &&

			   ~reg_msr & AT91_MSR_MABT)) {

			/* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */

			can_get_echo_skb(dev, mb - get_mb_tx_first(priv));

			can_get_echo_skb(dev, mb - get_mb_tx_first(priv), NULL);

			dev->stats.tx_packets++;

			can_led_event(dev, CAN_LED_EVENT_TX);

		}

drivers/net/can/c_can/c_can.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static void c_can_do_tx(struct net_device *dev) 
		pend &= ~(1 << idx);

		obj = idx + C_CAN_MSG_OBJ_TX_FIRST;

		c_can_inval_tx_object(dev, IF_RX, obj);

		can_get_echo_skb(dev, idx);

		can_get_echo_skb(dev, idx, NULL);

		bytes += priv->dlc[idx];

		pkts++;

	}

drivers/net/can/cc770/cc770.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o) 
	stats->tx_packets++;



	can_put_echo_skb(priv->tx_skb, dev, 0, 0);

	can_get_echo_skb(dev, 0);

	can_get_echo_skb(dev, 0, NULL);

	priv->tx_skb = NULL;



	netif_wake_queue(dev);

drivers/net/can/dev/skb.c

+3 −2
Original line number Diff line number Diff line
@@ -121,12 +121,13 @@ __can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr, 
 * is handled in the device driver. The driver must protect

 * access to priv->echo_skb, if necessary.

 */

unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx)

unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx,

			      unsigned int *frame_len_ptr)

{

	struct sk_buff *skb;

	u8 len;



	skb = __can_get_echo_skb(dev, idx, &len, NULL);

	skb = __can_get_echo_skb(dev, idx, &len, frame_len_ptr);

	if (!skb)

		return 0;

drivers/net/can/grcan.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static int catch_up_echo_skb(struct net_device *dev, int budget, bool echo) 
			stats->tx_packets++;

			stats->tx_bytes += priv->txdlc[i];

			priv->txdlc[i] = 0;

			can_get_echo_skb(dev, i);

			can_get_echo_skb(dev, i, NULL);

		} else {

			/* For cleanup of untransmitted messages */

			can_free_echo_skb(dev, i);