diff options
author | Peter Wu <peter@lekensteyn.nl> | 2015-12-08 14:17:42 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-23 07:55:45 +0300 |
commit | 0d39c93a8d31b7ae08386dfe5a7d608ecd4e11c4 (patch) | |
tree | ad5a8de98c428d6f046a188f3262ea5d7c2de348 /net | |
parent | de3a3fae4a7c31f8f22631c9b3ced9bce70ca2e0 (diff) | |
download | linux-0d39c93a8d31b7ae08386dfe5a7d608ecd4e11c4.tar.xz |
r8152: fix lockup when runtime PM is enabled
[ Upstream commit 90186af404ada5a47b875bf3c16d0b02bb023ea0 ]
When an interface is brought up which was previously suspended (via
runtime PM), it would hang. This happens because napi_disable is called
before napi_enable.
Solve this by avoiding napi_enable in the resume during open function
(netif_running is true when open is called, IFF_UP is set after a
successful open; netif_running is false when close is called, but IFF_UP
is then still set).
While at it, remove WORK_ENABLE check from rtl8152_open (introduced with
the original change) because it cannot happen:
- After this patch, runtime resume will not set it during rtl8152_open.
- When link is up, rtl8152_open is not called.
- When link is down during system/auto suspend/resume, it is not set.
Fixes: 41cec84cf285 ("r8152: don't enable napi before rx ready")
Link: https://lkml.kernel.org/r/20151205105912.GA1766@al
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Acked-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions