diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-10-10 23:43:53 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-02-03 01:21:25 +0100 |
| commit | cf5046b309b3a05c444a8edba6b44108510b7d7d (patch) | |
| tree | f0603d9caf8d3ce1050447c8817dfed25452eca8 /drivers/net | |
| parent | f84cbda06f79f05b748707b33b925b50c2fedc84 (diff) | |
| download | linux-cf5046b309b3a05c444a8edba6b44108510b7d7d.tar.gz linux-cf5046b309b3a05c444a8edba6b44108510b7d7d.tar.bz2 linux-cf5046b309b3a05c444a8edba6b44108510b7d7d.zip | |
can: dev: let can_get_echo_skb() return dlc of CAN frame
can_get_echo_skb() is usually called in the TX complete handler.
The stats->tx_packets and stats->tx_bytes should be updated there, too.
This patch simplifies to figure out the size of the sent CAN frame.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/dev.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 120f1ab5a2ce..9d9799cf68cd 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -327,16 +327,24 @@ EXPORT_SYMBOL_GPL(can_put_echo_skb); * is handled in the device driver. The driver must protect * access to priv->echo_skb, if necessary. */ -void can_get_echo_skb(struct net_device *dev, unsigned int idx) +unsigned int can_get_echo_skb(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(priv->echo_skb[idx]); priv->echo_skb[idx] = NULL; + + return dlc; } + + return 0; } EXPORT_SYMBOL_GPL(can_get_echo_skb); |