From: Artem Savkov <artem.savkov@gmail.com>
Date: Tue, 3 Apr 2012 10:29:11 +0000 (+0000)
Subject: r8169: enable napi on resume.
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc0640b826488895370d9558719692ff631ef3ba;p=users%2Fjedix%2Flinux-maple.git

r8169: enable napi on resume.

NAPI is disabled during suspend and needs to be enabled on resume. Without
this the driver locks up during resume in rtl_reset_work() trying to disable
NAPI again.

(cherry picked from commit cff4c16296754888b6fd8c886bc860a888e20257)
Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 921c395a1a8d..c9d2a1565170 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -6134,7 +6134,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);
 }