From a0411dda5b6de05fcfb76690ceb938ea33acefde Mon Sep 17 00:00:00 2001
From: Manfred Rudigier <Manfred.Rudigier@omicron.at>
Date: Mon, 9 Jan 2012 23:52:15 +0000
Subject: [PATCH] --- yaml --- r: 284335 b: refs/heads/master c:
 72092cc45378176ba700034c91b7af2db524df26 h: refs/heads/master i:   284333:
 fc36d362f3f07bf9212cb49f1c8edb64f45ecb4b   284331:
 0ea31861fcfa867f6ef2ef1cec9512556b6db9f8   284327:
 2af40a7b9b5bd2e6f096320ec5997edfeb5cd76d   284319:
 7d7bcc5b303fd122ecfd17a473cbabbc3caf172a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/phy/dp83640.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dfc3cd1e7ccf..70ca7aa6b8e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c4886e5e63bbecea0b560829a96f37e8d9ddd7c
+refs/heads/master: 72092cc45378176ba700034c91b7af2db524df26
diff --git a/trunk/drivers/net/phy/dp83640.c b/trunk/drivers/net/phy/dp83640.c
index 9663e0ba6003..ba3c59147aa7 100644
--- a/trunk/drivers/net/phy/dp83640.c
+++ b/trunk/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. */