[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240802000510.7088-1-Tristram.Ha@microchip.com>
Date: Thu, 1 Aug 2024 17:05:10 -0700
From: <Tristram.Ha@...rochip.com>
To: Oleksij Rempel <o.rempel@...gutronix.de>, Woojung Huh
<woojung.huh@...rochip.com>, Andrew Lunn <andrew@...n.ch>, Vivien Didelot
<vivien.didelot@...il.com>, Florian Fainelli <f.fainelli@...il.com>,
"Vladimir Oltean" <olteanv@...il.com>
CC: "David S. Miller" <davem@...emloft.net>, Eric Dumazet
<edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni
<pabeni@...hat.com>, <UNGLinuxDriver@...rochip.com>,
<netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, Tristram Ha
<tristram.ha@...rochip.com>
Subject: [PATCH net] net: dsa: microchip: Fix Wake-on-LAN check to not return an error
From: Tristram Ha <tristram.ha@...rochip.com>
The wol variable in ksz_port_set_mac_address() is declared with random
data, but the code in ksz_get_wol call may not be executed so the
WAKE_MAGIC check may be invalid resulting in an error message when
setting a MAC address after starting the DSA driver.
Fixes: 3b454b6390c3 ("net: dsa: microchip: ksz9477: Add Wake on Magic Packet support")
Signed-off-by: Tristram Ha <tristram.ha@...rochip.com>
---
drivers/net/dsa/microchip/ksz_common.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index b074b4bb0629..2725c5bc311c 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -3764,6 +3764,12 @@ static int ksz_port_set_mac_address(struct dsa_switch *ds, int port,
return -EBUSY;
}
+ /* Need to initialize variable as the code to fill in settings may
+ * not be executed.
+ */
+ wol.supported = 0;
+ wol.wolopts = 0;
+
ksz_get_wol(ds, dp->index, &wol);
if (wol.wolopts & WAKE_MAGIC) {
dev_err(ds->dev,
--
2.34.1
Powered by blists - more mailing lists