---

yaml --- r: 315709 b: refs/heads/master c: 007890d h: refs/heads/master i: 315707: 35cea77 v: v3
git-mirror · Jul 20, 2012 · 09ee6f7 · 09ee6f7
1 parent b61426b
commit 09ee6f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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 */