diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/atl1c/atl1c_ethtool.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/atl1c/atl1c_ethtool.c')
| -rw-r--r-- | drivers/net/atl1c/atl1c_ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c index 45c5b7332cd3..e4afbd628c23 100644 --- a/drivers/net/atl1c/atl1c_ethtool.c +++ b/drivers/net/atl1c/atl1c_ethtool.c | |||
| @@ -271,7 +271,7 @@ static int atl1c_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
| 271 | struct atl1c_adapter *adapter = netdev_priv(netdev); | 271 | struct atl1c_adapter *adapter = netdev_priv(netdev); |
| 272 | 272 | ||
| 273 | if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE | | 273 | if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE | |
| 274 | WAKE_MCAST | WAKE_BCAST | WAKE_MCAST)) | 274 | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)) |
| 275 | return -EOPNOTSUPP; | 275 | return -EOPNOTSUPP; |
| 276 | /* these settings will always override what we currently have */ | 276 | /* these settings will always override what we currently have */ |
| 277 | adapter->wol = 0; | 277 | adapter->wol = 0; |