diff options
| author | Ira W. Snyder <iws@ovro.caltech.edu> | 2012-07-19 00:33:14 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-20 12:31:06 +0200 |
| commit | 007890d726602c925077381500f0b633cfacd711 (patch) | |
| tree | 7264fd33cf7ce97840cd76c24a4734820de13be6 /drivers/net/can | |
| parent | can: janz-ican3: remove dead code (diff) | |
| download | linux-007890d726602c925077381500f0b633cfacd711.tar.xz linux-007890d726602c925077381500f0b633cfacd711.zip | |
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>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/janz-ican3.c | 3 |
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) 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 */ |