---

yaml --- r: 284335 b: refs/heads/master c: 72092cc h: refs/heads/master i: 284333: fc36d36 284331: 0ea3186 284327: 2af40a7 284319: 7d7bcc5 v: v3
git-mirror · Jan 12, 2012 · a0411dd · a0411dd
1 parent a6e04a7
commit a0411dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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. */