aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-10-04 10:50:51 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-10-18 11:19:42 +0200
commit57d3c7b09bd797b8db974557a71df8675a22601b (patch)
treeacbc78d1f16e27239027b54e2750ec40fc1b6ed1 /drivers/net/can
parent724829b3ad8e8aeb0aec46de383d35bfa1ad3875 (diff)
downloadmrst-s0i3-test-57d3c7b09bd797b8db974557a71df8675a22601b.tar.gz
mrst-s0i3-test-57d3c7b09bd797b8db974557a71df8675a22601b.tar.xz
mrst-s0i3-test-57d3c7b09bd797b8db974557a71df8675a22601b.zip
can: mcp251x: fix NOHZ local_softirq_pending 08 warning
This patch replaces netif_rx() with netif_rx_ni() which has to be used from the threaded interrupt i.e. process context context. Thanks to Christian Pellegrin for pointing at the right fix: 481a8199142c050b72bff8a1956a49fd0a75bbe0 by Oliver Hartkopp. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/mcp251x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c
index b11a0cb5ed8..c06e02382ec 100644
--- a/drivers/net/can/mcp251x.c
+++ b/drivers/net/can/mcp251x.c
@@ -451,7 +451,7 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)
priv->net->stats.rx_packets++;
priv->net->stats.rx_bytes += frame->can_dlc;
- netif_rx(skb);
+ netif_rx_ni(skb);
}
static void mcp251x_hw_sleep(struct spi_device *spi)
@@ -676,7 +676,7 @@ static void mcp251x_error_skb(struct net_device *net, int can_id, int data1)
if (skb) {
frame->can_id = can_id;
frame->data[1] = data1;
- netif_rx(skb);
+ netif_rx_ni(skb);
} else {
dev_err(&net->dev,
"cannot allocate error skb\n");