Skip to contentSkip to conversation

atl1e: WAKE_MCAST 2x. 1st WAKE_UCAST?

PATCH? Applied roel kluin 3 participants 4 messages Aug 7, 2008 – Aug 14, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

roel kluin

author
#0 lore raw

untested, is it right?
---
WAKE_MCAST bit tested twice, test WAKE_UCAST first.

Signed-off-by Roel Kluin <[email protected]>
drivers/net/atl1e/atl1e_ethtool.c +1 -1
index cdc3b85..619c658 100644
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 	struct atl1e_adapter *adapter = netdev_priv(netdev);
 
 	if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |
-			    WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))
+			    WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))
 		return -EOPNOTSUPP;
 	/* these settings will always override what we currently have */
 	adapter->wol = 0;
#1 lore raw
Quoted 20 lines · roel kluin

untested, is it right?
---
WAKE_MCAST bit tested twice, test WAKE_UCAST first.

Signed-off-by Roel Kluin <[email protected]> diff --git

a/drivers/net/atl1e/atl1e_ethtool.c
b/drivers/net/atl1e/atl1e_ethtool.c
index cdc3b85..619c658 100644

drivers/net/atl1e/atl1e_ethtool.c +1 -1
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct
 net_device *netdev, struct ethtool_wolinfo *wol)
        struct atl1e_adapter *adapter = netdev_priv(netdev);
 
        if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |
-                           WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))
+                           WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))
                return -EOPNOTSUPP;
        /* these settings will always override what we

currently have */

Quoted 2 lines
        adapter->wol = 0;

Yes, It should be this! Thanks!

Best wishes
jie

Acked-by
#2 lore raw
In reply to roel kluin

On Friday, August 08, 2008 12:25 AM
roel kluin <[email protected]> wrote

Quoted 21 lines

untested, is it right?
---
WAKE_MCAST bit tested twice, test WAKE_UCAST first.

Signed-off-by Roel Kluin <[email protected]> diff --git

a/drivers/net/atl1e/atl1e_ethtool.c
b/drivers/net/atl1e/atl1e_ethtool.c
index cdc3b85..619c658 100644

drivers/net/atl1e/atl1e_ethtool.c +1 -1
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct
 net_device *netdev, struct ethtool_wolinfo *wol)
        struct atl1e_adapter *adapter = netdev_priv(netdev);
 
        if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |
-                           WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))
+                           WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))
                return -EOPNOTSUPP;
        /* these settings will always override what we

currently have */

Quoted 2 lines
        adapter->wol = 0;

Yes, it should be this, thanks!

Acked-by Jie Yang <[email protected]>

BTW: resend on the comments from Jay Cliburn <[email protected]>

Thanks Jay

Applied
#3 lore raw
In reply to roel kluin
Quoted 10 lines · roel kluin

untested, is it right?
---
WAKE_MCAST bit tested twice, test WAKE_UCAST first.

Signed-off-by Roel Kluin <[email protected]>
drivers/net/atl1e/atl1e_ethtool.c +0 -0
index cdc3b85..619c658 100644

drivers/net/atl1e/atl1e_ethtool.c static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) · line 360

Quoted 7 lines
drivers/net/atl1e/atl1e_ethtool.c +1 -1
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 	struct atl1e_adapter *adapter = netdev_priv(netdev);
 
 	if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |
-			    WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))
+			    WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))
 		return -EOPNOTSUPP;
 	/* these settings will always override what we currently have */

applied