aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorWolfgang Grandegger <wg@grandegger.com>2012-02-01 10:50:23 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2012-02-03 00:25:15 +0100
commite3f240f460a36b158217944b52a85f304914c1a6 (patch)
treebcdfad758df83296f712a6479fe412ac2178fb33 /drivers/net
parent2d5091e08c684912ed6b9ca03d1f7b01501b7bf6 (diff)
can: ti_hecc: use netif_rx in the interrupt
This patch fixes locking problems by using netif_rx() instead of netif_receive_skb() in ti_hecc_error() called from the interrupt context. Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/ti_hecc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index df809e3f130..5a2e1e3588a 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -745,9 +745,10 @@ static int ti_hecc_error(struct net_device *ndev, int int_status,
}
}
- netif_receive_skb(skb);
+ netif_rx(skb);
stats->rx_packets++;
stats->rx_bytes += cf->can_dlc;
+
return 0;
}