Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 112196
b: refs/heads/master
c: 8b76ab3
h: refs/heads/master
v: v3
  • Loading branch information
Bruno Prémont authored and David S. Miller committed Oct 9, 2008
1 parent 8f88b32 commit fdd9d16
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20037fa407f26716866eff95221c4882babe1280
refs/heads/master: 8b76ab39196edd459d209f6d6a075fa15e9da232
2 changes: 2 additions & 0 deletions trunk/drivers/net/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@ static int rtl8169_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
tp->features |= RTL_FEATURE_WOL;
else
tp->features &= ~RTL_FEATURE_WOL;
device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);

spin_unlock_irq(&tp->lock);

Expand Down Expand Up @@ -2017,6 +2018,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}

rtl8169_init_phy(dev, tp);
device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);

out:
return rc;
Expand Down

0 comments on commit fdd9d16

Please sign in to comment.