Commit 29e2e6e6 authored by Connor Kuehl's avatar Connor Kuehl Committed by Stefan Bader

UBUNTU: SAUCE: Revert "net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol()"

BugLink: https://bugs.launchpad.net/bugs/1852110

This reverts commit 013b832f in favor of
the upstream stable version.
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 572eb6a9
...@@ -1424,13 +1424,11 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr) ...@@ -1424,13 +1424,11 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr)
static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) static int ethtool_get_wol(struct net_device *dev, char __user *useraddr)
{ {
struct ethtool_wolinfo wol; struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
if (!dev->ethtool_ops->get_wol) if (!dev->ethtool_ops->get_wol)
return -EOPNOTSUPP; return -EOPNOTSUPP;
memset(&wol, 0, sizeof(struct ethtool_wolinfo));
wol.cmd = ETHTOOL_GWOL;
dev->ethtool_ops->get_wol(dev, &wol); dev->ethtool_ops->get_wol(dev, &wol);
if (copy_to_user(useraddr, &wol, sizeof(wol))) if (copy_to_user(useraddr, &wol, sizeof(wol)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment