From: Marc Kleine-Budde <mkl@pengutronix.de>
To: davem@davemloft.net
Cc: Netdev@vger.kernel.org, kernel@pengutronix.de,
mkl@blackshift.org, linux-can@vger.kernel.org,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 2/9] can: dev: let can_get_echo_skb() return dlc of CAN frame
Date: Fri, 3 Feb 2012 01:51:51 +0100 [thread overview]
Message-ID: <1328230318-8962-3-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1328230318-8962-1-git-send-email-mkl@pengutronix.de>
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>
---
drivers/net/can/dev.c | 10 +++++++++-
include/linux/can/dev.h | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 120f1ab..9d9799c 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);
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index a0969fc..5d2efe7 100644
--- a/include/linux/can/dev.h
+++ b/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);
--
1.7.4.1
next prev parent reply other threads:[~2012-02-03 0:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 0:51 [PATCH 0/9] can: driver updates Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 1/9] can: ems_usb: Removed double netif_device_detach Marc Kleine-Budde
2012-02-03 0:51 ` Marc Kleine-Budde [this message]
2012-02-03 0:51 ` [PATCH 3/9] can: flexcan: Fix CAN_RAW_RECV_OWN_MSGS and CAN_RAW_LOOPBACK Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 4/9] can: ems_usb: Improved memory handling on ems_usb_start Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 5/9] can: plx_pci: add support for IXXAT PCI cards Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 6/9] can: pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 7/9] can: Kconfig: add more information about Intel EG20T PCH CAN controller Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 8/9] can: bfin_can/ti_hecc/mscan: add missing do_get_berr_counter callback Marc Kleine-Budde
2012-02-03 0:51 ` [PATCH 9/9] can: replace the dev_dbg/info/err/... with the new netdev_xxx macros Marc Kleine-Budde
2012-02-04 21:44 ` [PATCH 0/9] can: driver updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328230318-8962-3-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=Netdev@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mkl@blackshift.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).