summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorArtem Savkov <artem.savkov@gmail.com>2012-04-03 10:29:11 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-03 19:08:40 -0400
commitcff4c16296754888b6fd8c886bc860a888e20257 (patch)
tree3f9ebdc32de18afaa79aa247fca40b66b2f4787c /drivers/net
parentf2ed5ee1b050495be49e5a0d5df152663558ef08 (diff)
downloadop-kernel-dev-cff4c16296754888b6fd8c886bc860a888e20257.zip
op-kernel-dev-cff4c16296754888b6fd8c886bc860a888e20257.tar.gz
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. 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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/realtek/r8169.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 7b23554..f545093 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/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);
}
OpenPOWER on IntegriCloud