Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

[~andy/linux] / drivers / net / phy / dp83640.c

diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 9663e0ba60034d8edf1806c8bcd7eb928a7c4733..ba3c59147aa7eecda0e6cf1ff344caa498eb91fd 100644 (file)
--- 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. */