summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorManfred Rudigier <Manfred.Rudigier@omicron.at>2012-01-10 00:52:15 +0100
committerDavid S. Miller <davem@davemloft.net>2012-01-13 00:26:01 +0100
commit72092cc45378176ba700034c91b7af2db524df26 (patch)
tree5505277b40f14304d78729aee8264b024799b775 /drivers/net
parentgianfar: Fix invalid TX frames returned on error queue when time stamping (diff)
downloadlinux-72092cc45378176ba700034c91b7af2db524df26.tar.xz
linux-72092cc45378176ba700034c91b7af2db524df26.zip
dp83640: Fix NOHZ local_softirq_pending 08 warning
Similar problem as in 481a8199142c050b72bff8a1956a49fd0a75bbe0 ("can: fix NOHZ local_softirq_pending 08 warning"). This fix replaces netif_rx() with netif_rx_ni() which has to be used from process/softirq context. Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/dp83640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 9663e0ba6003..ba3c59147aa7 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1159,7 +1159,7 @@ static void rx_timestamp_work(struct work_struct *work)
}
}
spin_unlock_irqrestore(&dp83640->rx_lock, flags);
- netif_rx(skb);
+ netif_rx_ni(skb);
}
/* Clear out expired time stamps. */