aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIra W. Snyder <iws@ovro.caltech.edu>2012-07-18 18:33:14 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-07-20 06:31:06 -0400
commit007890d726602c925077381500f0b633cfacd711 (patch)
tree7264fd33cf7ce97840cd76c24a4734820de13be6
parent8456a9196f7696421eecffdbab5d785f852d95e8 (diff)
can: janz-ican3: drop invalid skbs
The commit which added the janz-ican3 driver and commit 3ccd4c61 "can: Unify droping of invalid tx skbs and netdev stats" were committed into mainline Linux during the same merge window. Therefore, the addition of this code to the janz-ican3 driver was forgotten. This patch adds the expected code. Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/janz-ican3.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
index f41623d003e1..754b803fa926 100644
--- a/drivers/net/can/janz-ican3.c
+++ b/drivers/net/can/janz-ican3.c
@@ -1420,6 +1420,9 @@ static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev)
1420 void __iomem *desc_addr; 1420 void __iomem *desc_addr;
1421 unsigned long flags; 1421 unsigned long flags;
1422 1422
1423 if (can_dropped_invalid_skb(ndev, skb))
1424 return NETDEV_TX_OK;
1425
1423 spin_lock_irqsave(&mod->lock, flags); 1426 spin_lock_irqsave(&mod->lock, flags);
1424 1427
1425 /* check that we can actually transmit */ 1428 /* check that we can actually transmit */