From patchwork Tue Mar 11 23:02:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 329261 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 966932C00AD for ; Wed, 12 Mar 2014 10:03:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755710AbaCKXDN (ORCPT ); Tue, 11 Mar 2014 19:03:13 -0400 Received: from mail-ea0-f180.google.com ([209.85.215.180]:35565 "EHLO mail-ea0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754819AbaCKXDM (ORCPT ); Tue, 11 Mar 2014 19:03:12 -0400 Received: by mail-ea0-f180.google.com with SMTP id m10so4561629eaj.25 for ; Tue, 11 Mar 2014 16:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=02KCydiR+jZwMhbSt7W3+jAN53vV11GgVgVIMfnyczw=; b=GNURxrPjv7C7D7YbWQ0Im9OJysVkyVvmboJFWyam209WwP4qCwddU/vpxbV6cdog3O j5Op8dGg+mbc8ccN9kF0IqqmZs3bXpoLRdyb0b9dcRVtnjPElMjiuTERFo66ppPU1HxC UXcrBww1w1U4Svx+nbs7W1QFdQm2hUv4aF09T/w+y9BJ/l7zwzC0I3MEI+jV+pR9TTgU mF26NnH2L+53GsaPhTlH+b7zbmolSK55jvK4ozOpNBOe4hK5C9SyxKwAfcTC51N0mjJF f51Z4NURfuwSlqwfAzwSd6aKNDHis+QLPF+/7mfAuxHOFHpc8Iw+m58XCdbgKqxvBIe/ 6tEw== X-Received: by 10.15.60.199 with SMTP id g47mr44394662eex.37.1394578989224; Tue, 11 Mar 2014 16:03:09 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-183.pools.arcor-ip.net. [82.83.251.183]) by mx.google.com with ESMTPSA id 46sm62778248ees.4.2014.03.11.16.03.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2014 16:03:08 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Florian Fainelli , Ben Hutchings , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol Date: Wed, 12 Mar 2014 00:02:55 +0100 Message-Id: <1394578975-12588-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1394484661-4554-2-git-send-email-sebastian.hesselbarth@gmail.com> References: <1394484661-4554-2-git-send-email-sebastian.hesselbarth@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org phy_ethtool_get_wol is a helper to get current WOL settings from a phy device. When using this helper on a PHY without .get_wol callback, struct ethtool_wolinfo is never set-up correctly and may contain misleading information about WOL status. To fix this, always zero relevant fields of struct ethtool_wolinfo regardless of .get_wol callback availability. Signed-off-by: Sebastian Hesselbarth Reviewed-by: Florian Fainelli --- Changelog: v1->v2: - clear whole struct ethtool_wolinfo - check for non-NULL phy_device v2->v3: - only clear ->supported and ->wolopts (Suggested by Ben Hutchings) Cc: David Miller Cc: Florian Fainelli Cc: Ben Hutchings Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/phy/phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 19c9eca0ef26..94234a91a50f 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1092,7 +1092,9 @@ EXPORT_SYMBOL(phy_ethtool_set_wol); void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) { - if (phydev->drv->get_wol) + wol->supported = wol->wolopts = 0; + + if (phydev && phydev->drv->get_wol) phydev->drv->get_wol(phydev, wol); } EXPORT_SYMBOL(phy_ethtool_get_wol);