diff options
author | Oliver Hartkopp <oliver@hartkopp.net> | 2010-01-12 05:00:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-12 05:00:46 -0500 |
commit | 3ccd4c6167d3b39d52631767ebbf8b5677c5855d (patch) | |
tree | bfcb801edebd00e8b30e897038bad7fee39625cc /drivers/net/can/sja1000/sja1000.c | |
parent | d218d11133d888f9745802146a50255a4781d37a (diff) |
can: Unify droping of invalid tx skbs and netdev stats
To prevent the CAN drivers to operate on invalid socketbuffers the skbs are
now checked and silently dropped at the xmit-function consistently.
Also the netdev stats are consistently using the CAN data length code (dlc)
for [rx|tx]_bytes now.
Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000/sja1000.c')
-rw-r--r-- | drivers/net/can/sja1000/sja1000.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index 542a4f7255b4..345304d779b9 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c | |||
@@ -249,6 +249,9 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb, | |||
249 | uint8_t dreg; | 249 | uint8_t dreg; |
250 | int i; | 250 | int i; |
251 | 251 | ||
252 | if (can_dropped_invalid_skb(dev, skb)) | ||
253 | return NETDEV_TX_OK; | ||
254 | |||
252 | netif_stop_queue(dev); | 255 | netif_stop_queue(dev); |
253 | 256 | ||
254 | fi = dlc = cf->can_dlc; | 257 | fi = dlc = cf->can_dlc; |