Corcodel Marian <corcodel.mar...@gmail.com> : [...] > diff --git a/drivers/net/ethernet/realtek/r8169.c > b/drivers/net/ethernet/realtek/r8169.c > index 410c1ee..be67873 100644 > --- a/drivers/net/ethernet/realtek/r8169.c > +++ b/drivers/net/ethernet/realtek/r8169.c > @@ -7555,11 +7555,13 @@ static int rtl8169_close(struct net_device *dev) > > rtl_lock_work(tp); > clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); > - > - rtl8169_down(dev); > rtl_unlock_work(tp); > > + rtl8169_down(dev); > + //rtl_unlock_work(tp); > + rtl_lock_work(tp); > cancel_work_sync(&tp->wk.work); > + rtl_unlock_work(tp); > > free_irq(pdev->irq, dev);
tab/spaces mix. Stray commented code. rtl_lock_work/cancel_work_sync/rtl_unlock_work makes no sense. [...] > @@ -7611,10 +7614,12 @@ static int rtl_open(struct net_device *dev) > if (retval < 0) > goto err_free_rx_1; > > + rtl_lock_work(tp); > INIT_WORK(&tp->wk.work, rtl_task); > - > + rtl_unlock_work(tp); > smp_mb(); ? Irq has not been requested : this code isn't racing with NAPI. I don't see either how it could race with a runtime resume handler. Care to elaborate what it is supposed to race with ? > > + rtl_lock_work(tp); > rtl_request_firmware(tp); > > retval = request_irq(pdev->irq, rtl8169_interrupt, > @@ -7623,7 +7628,7 @@ static int rtl_open(struct net_device *dev) > if (retval < 0) > goto err_release_fw_2; You forgot to balance rtl_lock_work after the err_release_fw_2 label. :o/ -- Ueimor -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
