]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
can: janz-ican3: drop invalid skbs
authorIra W. Snyder <iws@ovro.caltech.edu>
Wed, 18 Jul 2012 22:33:14 +0000 (15:33 -0700)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 20 Jul 2012 10:31:06 +0000 (12:31 +0200)
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>
drivers/net/can/janz-ican3.c

index f41623d003e1954578bd91125944a26be4c3ecca..754b803fa92697b5267d0f4c7274559f0f7da399 100644 (file)
@@ -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 */