diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-04 04:50:51 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-10-18 05:19:42 -0400 |
commit | 57d3c7b09bd797b8db974557a71df8675a22601b (patch) | |
tree | acbc78d1f16e27239027b54e2750ec40fc1b6ed1 /drivers/net/can/mcp251x.c | |
parent | 724829b3ad8e8aeb0aec46de383d35bfa1ad3875 (diff) |
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/mcp251x.c')
-rw-r--r-- | drivers/net/can/mcp251x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index b11a0cb5ed81..c06e02382eca 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) | |||
451 | 451 | ||
452 | priv->net->stats.rx_packets++; | 452 | priv->net->stats.rx_packets++; |
453 | priv->net->stats.rx_bytes += frame->can_dlc; | 453 | priv->net->stats.rx_bytes += frame->can_dlc; |
454 | netif_rx(skb); | 454 | netif_rx_ni(skb); |
455 | } | 455 | } |
456 | 456 | ||
457 | static void mcp251x_hw_sleep(struct spi_device *spi) | 457 | 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) | |||
676 | if (skb) { | 676 | if (skb) { |
677 | frame->can_id = can_id; | 677 | frame->can_id = can_id; |
678 | frame->data[1] = data1; | 678 | frame->data[1] = data1; |
679 | netif_rx(skb); | 679 | netif_rx_ni(skb); |
680 | } else { | 680 | } else { |
681 | dev_err(&net->dev, | 681 | dev_err(&net->dev, |
682 | "cannot allocate error skb\n"); | 682 | "cannot allocate error skb\n"); |