[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200906101955.n5AJt3nD008241@imap1.linux-foundation.org>
Date: Wed, 10 Jun 2009 12:55:03 -0700
From: akpm@...ux-foundation.org
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
roel.kluin@...il.com, csnook@...hat.com, jcliburn@...il.com,
jie.yang@...eros.com
Subject: [patch 3/4] atl1c: WAKE_MCAST tested twice, not WAKE_UCAST
From: Roel Kluin <roel.kluin@...il.com>
The WAKE_MCAST bit is tested twice, the first should be WAKE_UCAST.
Signed-off-by: Roel Kluin <roel.kluin@...il.com>
Cc: Jie Yang <jie.yang@...eros.com>
Cc: Jay Cliburn <jcliburn@...il.com>
Cc: Chris Snook <csnook@...hat.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
drivers/net/atl1c/atl1c_ethtool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/atl1c/atl1c_ethtool.c~atl1c-wake_mcast-tested-twice-not-wake_ucast drivers/net/atl1c/atl1c_ethtool.c
--- a/drivers/net/atl1c/atl1c_ethtool.c~atl1c-wake_mcast-tested-twice-not-wake_ucast
+++ a/drivers/net/atl1c/atl1c_ethtool.c
@@ -271,7 +271,7 @@ static int atl1c_set_wol(struct net_devi
struct atl1c_adapter *adapter = netdev_priv(netdev);
if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |
- WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))
+ WAKE_UCAST | WAKE_BCAST | WAKE_MCAST))
return -EOPNOTSUPP;
/* these settings will always override what we currently have */
adapter->wol = 0;
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists