---

yaml --- r: 298751 b: refs/heads/master c: cff4c16 h: refs/heads/master i: 298749: 9f50f93 298747: 8d4ad1a 298743: 9a6b4e2 298735: 8a05ffd 298719: a622044 298687: aa18714 298623: 64bbf91 298495: 68b29a1 v: v3
git-mirror · Apr 3, 2012 · fab771c · fab771c
1 parent 18f06bb
commit fab771c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 }