lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 21 Apr 2020 12:41:00 +0200 From: <nicolas.ferre@...rochip.com> To: <linux-arm-kernel@...ts.infradead.org>, <netdev@...r.kernel.org>, "Claudiu Beznea" <claudiu.beznea@...rochip.com>, <harini.katakam@...inx.com> CC: <linux-kernel@...r.kernel.org>, "David S. Miller" <davem@...emloft.net>, Alexandre Belloni <alexandre.belloni@...tlin.com>, <sergio.prado@...abworks.com>, <antoine.tenart@...tlin.com>, <f.fainelli@...il.com>, <linux@...linux.org.uk>, <andrew@...n.ch>, <michal.simek@...inx.com>, Nicolas Ferre <nicolas.ferre@...rochip.com> Subject: [PATCH v2 3/7] net: macb: fix macb_get/set_wol() when moving to phylink From: Nicolas Ferre <nicolas.ferre@...rochip.com> Keep previous function goals and integrate phylink actions to them. phylink_ethtool_get_wol() is not enough to figure out if Ethernet driver supports Wake-on-Lan. Initialization of "supported" and "wolopts" members is done in phylink function, no need to keep them in calling function. phylink_ethtool_set_wol() return value is not enough to determine if WoL is enabled for the calling Ethernet driver. Call it first but don't rely on its return value as most of simple PHY drivers don't implement a set_wol() function. Fixes: 7897b071ac3b ("net: macb: convert to phylink") Cc: Claudiu Beznea <claudiu.beznea@...rochip.com> Cc: Harini Katakam <harini.katakam@...inx.com> Cc: Antoine Tenart <antoine.tenart@...tlin.com> Reviewed-by: Florian Fainelli <f.fainelli@...il.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@...rochip.com> --- drivers/net/ethernet/cadence/macb_main.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 629660d9f17e..b17a33c60cd4 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2813,21 +2813,23 @@ static void macb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) { struct macb *bp = netdev_priv(netdev); - wol->supported = 0; - wol->wolopts = 0; - - if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) + if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) { phylink_ethtool_get_wol(bp->phylink, wol); + wol->supported |= WAKE_MAGIC; + + if (bp->wol & MACB_WOL_ENABLED) + wol->wolopts |= WAKE_MAGIC; + } } static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) { struct macb *bp = netdev_priv(netdev); - int ret; - ret = phylink_ethtool_set_wol(bp->phylink, wol); - if (!ret) - return 0; + /* Pass the order to phylink layer. + * Don't test return value as set_wol() is often not supported. + */ + phylink_ethtool_set_wol(bp->phylink, wol); if (!(bp->wol & MACB_WOL_HAS_MAGIC_PACKET) || (wol->wolopts & ~WAKE_MAGIC)) -- 2.20.1
Powered by blists - more mailing lists