From fab771cf0ab18e0e2ea39c451dfc49b93c2898e5 Mon Sep 17 00:00:00 2001
From: Artem Savkov <artem.savkov@gmail.com>
Date: Tue, 3 Apr 2012 10:29:11 +0000
Subject: [PATCH] --- yaml --- r: 298751 b: refs/heads/master c:
 cff4c16296754888b6fd8c886bc860a888e20257 h: refs/heads/master i:   298749:
 9f50f9366c033cf2aee8f7146e56877128cd9191   298747:
 8d4ad1aabde7d419614cd944d576fa4488789ff2   298743:
 9a6b4e26535a61c8907b33bfcce64318870d555d   298735:
 8a05ffd9acb73487b0725849ea749f4592f1fe6d   298719:
 a622044e2c2e0b3ee744d9fd4e4765542959527b   298687:
 aa18714157c39e6f779c341ec09fe3aafae5bc10   298623:
 64bbf9106a386021d71642c6a80982f66f77f5c4   298495:
 68b29a18d9dfc1388252fefb15ebcb6b59487ce4 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/realtek/r8169.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5d852320672b..186d06f4660a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2ed5ee1b050495be49e5a0d5df152663558ef08
+refs/heads/master: cff4c16296754888b6fd8c886bc860a888e20257
diff --git a/trunk/drivers/net/ethernet/realtek/r8169.c b/trunk/drivers/net/ethernet/realtek/r8169.c
index 7b23554f80b6..f54509377efa 100644
--- a/trunk/drivers/net/ethernet/realtek/r8169.c
+++ b/trunk/drivers/net/ethernet/realtek/r8169.c
@@ -5810,7 +5810,10 @@ static void __rtl8169_resume(struct net_device *dev)
 
 	rtl_pll_power_up(tp);
 
+	rtl_lock_work(tp);
+	napi_enable(&tp->napi);
 	set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+	rtl_unlock_work(tp);
 
 	rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
 }