From d9f4608e74457115b5277f88c30254ed9e136f96 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Mon, 10 Oct 2011 23:43:53 +0200
Subject: [PATCH] --- yaml --- r: 289887 b: refs/heads/master c:
 cf5046b309b3a05c444a8edba6b44108510b7d7d h: refs/heads/master i:   289885:
 1c8efcce5f8a113e0f03bd769ba66cf1dbb30993   289883:
 b6d883cf376ee8885c3b8a972714e3905b89deee   289879:
 84be483f66a0625f3064cee8c7217c31aa3d15ff   289871:
 0a3922c499fd64c8bb30a0a212d65aebf0e4f857   289855:
 0c34e79110680428e4d3c75b44b25e5bd96c7808 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/can/dev.c   | 10 +++++++++-
 trunk/include/linux/can/dev.h |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8eccd4f1fb7d..1422ae2d858c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f84cbda06f79f05b748707b33b925b50c2fedc84
+refs/heads/master: cf5046b309b3a05c444a8edba6b44108510b7d7d
diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c
index 120f1ab5a2ce..9d9799cf68cd 100644
--- a/trunk/drivers/net/can/dev.c
+++ b/trunk/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);
 
diff --git a/trunk/include/linux/can/dev.h b/trunk/include/linux/can/dev.h
index a0969fcb72b9..5d2efe7e3f1b 100644
--- a/trunk/include/linux/can/dev.h
+++ b/trunk/include/linux/can/dev.h
@@ -92,7 +92,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);
-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);
 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);