Commit b181306e authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: remove redundant WoL option validation 



The core ethtool API validates the WoL options passed from userspace
against the support which the driver reports from its get_wol() method,
returning EINVAL if an unsupported mode is requested.

Therefore, there is no need for stmmac to implement its own validation.
Remove this unnecessary code.

See ethnl_set_wol() in net/ethtool/wol.c and ethtool_set_wol() in
net/ethtool/ioctl.c.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1umsfA-008vKW-H1@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 49b97bc5

drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c

+0 −10
Original line number Diff line number Diff line
@@ -803,7 +803,6 @@ static void stmmac_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)

{

	struct stmmac_priv *priv = netdev_priv(dev);

	u32 support = WAKE_MAGIC | WAKE_UCAST;



	if (!device_can_wakeup(priv->device))

		return -EOPNOTSUPP;
@@ -816,15 +815,6 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
		return ret;

	}



	/* By default almost all GMAC devices support the WoL via

	 * magic frame but we can disable it if the HW capability

	 * register shows no support for pmt_magic_frame. */

	if ((priv->hw_cap_support) && (!priv->dma_cap.pmt_magic_frame))

		wol->wolopts &= ~WAKE_MAGIC;



	if (wol->wolopts & ~support)

		return -EINVAL;



	if (wol->wolopts) {

		pr_info("stmmac: wakeup enable\n");

		device_set_wakeup_enable(priv->device, 1);