lkml.org 
[lkml]   [2014]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v2 3/3] r8152: check RTL8152_UNPLUG and netif_running before autoresume
    Date
    If the device is unplugged or !netif_running(), the workqueue
    doesn't need to wake the device, and could return directly.

    Signed-off-by: Hayes Wang <hayeswang@realtek.com>
    ---
    drivers/net/usb/r8152.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
    index 670279a..90cc89c 100644
    --- a/drivers/net/usb/r8152.c
    +++ b/drivers/net/usb/r8152.c
    @@ -2859,15 +2859,18 @@ static void rtl_work_func_t(struct work_struct *work)
    {
    struct r8152 *tp = container_of(work, struct r8152, schedule.work);

    + /* If the device is unplugged or !netif_running(), the workqueue
    + * doesn't need to wake the device, and could return directly.
    + */
    + if (test_bit(RTL8152_UNPLUG, &tp->flags) || !netif_running(tp->netdev))
    + return;
    +
    if (usb_autopm_get_interface(tp->intf) < 0)
    return;

    if (!test_bit(WORK_ENABLE, &tp->flags))
    goto out1;

    - if (test_bit(RTL8152_UNPLUG, &tp->flags))
    - goto out1;
    -
    if (!mutex_trylock(&tp->control)) {
    schedule_delayed_work(&tp->schedule, 0);
    goto out1;
    --
    1.9.3


    \
     
     \ /
      Last update: 2014-10-31 11:21    [W:4.151 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site