[PATCH v1 3/3] Introduce can_get_echo_skb_ni() when TX is not in interrupt
From: Stefano Babic <hidden>
Date: 2014-03-21 12:34:28
Subsystem:
can network drivers, the rest · Maintainers:
Marc Kleine-Budde, Vincent Mailhol, Linus Torvalds
Drivers that do not have TX inside an interrupt handler must call this function that replaces netif_rx with netif_rx_ni. Signed-off-by: Stefano Babic <redacted> --- drivers/net/can/dev.c | 21 +++++++++++++++++++++ include/linux/can/dev.h | 1 + 2 files changed, 22 insertions(+)
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index fc59bc6..53081fd 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c@@ -372,6 +372,27 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx) } EXPORT_SYMBOL_GPL(can_get_echo_skb); +unsigned int can_get_echo_skb_ni(struct net_device *dev, unsigned int idx) +{ + struct can_priv *priv = netdev_priv(dev); + + BUG_ON(idx >= priv->echo_skb_max); + + if (priv->echo_skb[idx]) { + struct sk_buff *skb = priv->echo_skb[idx]; + struct can_frame *cf = (struct can_frame *)skb->data; + u8 dlc = cf->can_dlc; + + netif_rx_ni(priv->echo_skb[idx]); + priv->echo_skb[idx] = NULL; + + return dlc; + } + + return 0; +} +EXPORT_SYMBOL_GPL(can_get_echo_skb_ni); + /* * Remove the skb from the stack and free it. *
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index fb0ab65..57b678a 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h@@ -121,6 +121,7 @@ void can_bus_off(struct net_device *dev); void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, unsigned int idx); unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx); +unsigned int can_get_echo_skb_ni(struct net_device *dev, unsigned int idx); void can_free_echo_skb(struct net_device *dev, unsigned int idx); struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
--
1.7.9.5