Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bcd10db authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by Greg Kroah-Hartman
Browse files

can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb() 



commit a4310fa2f24687888ce80fdb0e88583561a23700 upstream.

This patch factors out all non sending parts of can_get_echo_skb() into
a seperate function __can_get_echo_skb(), so that it can be re-used in
an upcoming patch.

Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0bf67de5

drivers/net/can/dev.c

+25 −11
Original line number Diff line number Diff line
@@ -453,14 +453,7 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, 
}

EXPORT_SYMBOL_GPL(can_put_echo_skb);



/*

 * Get the skb from the stack and loop it back locally

 *

 * The function is typically called when the TX done interrupt

 * 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)

struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr)

{

	struct can_priv *priv = netdev_priv(dev);
@@ -471,13 +464,34 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx) 
		struct can_frame *cf = (struct can_frame *)skb->data;

		u8 dlc = cf->can_dlc;



		netif_rx(priv->echo_skb[idx]);

		*len_ptr = dlc;

		priv->echo_skb[idx] = NULL;



		return dlc;

		return skb;

	}



	return NULL;

}



/*

 * Get the skb from the stack and loop it back locally

 *

 * The function is typically called when the TX done interrupt

 * 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)

{

	struct sk_buff *skb;

	u8 len;



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

	if (!skb)

		return 0;



	netif_rx(skb);



	return len;

}

EXPORT_SYMBOL_GPL(can_get_echo_skb);

include/linux/can/dev.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ void can_change_state(struct net_device *dev, struct can_frame *cf, 


void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,

		      unsigned int idx);

struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr);

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

void can_free_echo_skb(struct net_device *dev, unsigned int idx);