| Message ID | 20101108232358.GB13720@electric-eye.fr.zoreil.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Was getting this error on boot "BUG: scheduling while atomic: ethtool/1430/0x00000002" patch fixed them. Acked-by: Andrew Hendry <andrew.hendry@gmail.com> On Tue, Nov 9, 2010 at 10:23 AM, Francois Romieu <romieu@fr.zoreil.com> wrote: > As device_set_wakeup_enable can now sleep, move the call to outside > the critical section. > > Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com> > Acked-by: Rafael J. Wysocki <rjw@sisk.pl> > --- > drivers/net/r8169.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c > index 3a0877e..4c4d169 100644 > --- a/drivers/net/r8169.c > +++ b/drivers/net/r8169.c > @@ -846,10 +846,10 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) > else > tp->features &= ~RTL_FEATURE_WOL; > __rtl8169_set_wol(tp, wol->wolopts); > - device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); > - > spin_unlock_irq(&tp->lock); > > + device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); > + > return 0; > } > > -- > 1.7.2.3 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Francois Romieu <romieu@fr.zoreil.com> Date: Tue, 9 Nov 2010 00:23:58 +0100 > As device_set_wakeup_enable can now sleep, move the call to outside > the critical section. > > Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com> > Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 3a0877e..4c4d169 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -846,10 +846,10 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) else tp->features &= ~RTL_FEATURE_WOL; __rtl8169_set_wol(tp, wol->wolopts); - device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); - spin_unlock_irq(&tp->lock); + device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts); + return 0; }