From 09ee6f7214934c37a7ce76771ab0636a620a55b1 Mon Sep 17 00:00:00 2001
From: "Ira W. Snyder" <iws@ovro.caltech.edu>
Date: Wed, 18 Jul 2012 15:33:14 -0700
Subject: [PATCH] --- yaml --- r: 315709 b: refs/heads/master c:
 007890d726602c925077381500f0b633cfacd711 h: refs/heads/master i:   315707:
 35cea77acf110d48457620288f44bce907b983e2 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/can/janz-ican3.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2cf94b510221..f91d2b992705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8456a9196f7696421eecffdbab5d785f852d95e8
+refs/heads/master: 007890d726602c925077381500f0b633cfacd711
diff --git a/trunk/drivers/net/can/janz-ican3.c b/trunk/drivers/net/can/janz-ican3.c
index f41623d003e1..754b803fa926 100644
--- a/trunk/drivers/net/can/janz-ican3.c
+++ b/trunk/drivers/net/can/janz-ican3.c
@@ -1420,6 +1420,9 @@ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
 	void __iomem *desc_addr;
 	unsigned long flags;
 
+	if (can_dropped_invalid_skb(ndev, skb))
+		return NETDEV_TX_OK;
+
 	spin_lock_irqsave(&mod->lock, flags);
 
 	/* check that we can actually transmit */