From 7557ee02cbc95c00eef2c3b8340e48128baa0d0c Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Fri, 20 Nov 2009 23:22:01 +0000 Subject: [PATCH] --- yaml --- r: 171776 b: refs/heads/master c: 1fbfca3211ce50d992d66bcda71fc47bf5e268c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ethtool.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cab6efe4ee75..2e5fd3a2031a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e994b7c901ded7200b525a707c6da71f2cf6d4bb +refs/heads/master: 1fbfca3211ce50d992d66bcda71fc47bf5e268c9 diff --git a/trunk/drivers/net/e1000e/ethtool.c b/trunk/drivers/net/e1000e/ethtool.c index c430dc8b70a3..3af5ee4a4cc8 100644 --- a/trunk/drivers/net/e1000e/ethtool.c +++ b/trunk/drivers/net/e1000e/ethtool.c @@ -1777,12 +1777,11 @@ static int e1000_set_wol(struct net_device *netdev, { struct e1000_adapter *adapter = netdev_priv(netdev); - if (wol->wolopts & WAKE_MAGICSECURE) - return -EOPNOTSUPP; - if (!(adapter->flags & FLAG_HAS_WOL) || - !device_can_wakeup(&adapter->pdev->dev)) - return wol->wolopts ? -EOPNOTSUPP : 0; + !device_can_wakeup(&adapter->pdev->dev) || + (wol->wolopts & ~(WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | + WAKE_MAGIC | WAKE_PHY | WAKE_ARP))) + return -EOPNOTSUPP; /* these settings will always override what we currently have */ adapter->wol = 0;