Netdev List
 help / color / mirror / Atom feed
From: Lipeng <lipeng321@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linuxarm@huawei.com>, <salil.mehta@huawei.com>,
	<lipeng321@huawei.com>
Subject: [PATCH V3 net-next 11/17] net: hns3: fix for getting auto-negotiation state in hclge_get_autoneg
Date: Wed, 20 Dec 2017 16:43:13 +0800	[thread overview]
Message-ID: <1513759399-40915-12-git-send-email-lipeng321@huawei.com> (raw)
In-Reply-To: <1513759399-40915-1-git-send-email-lipeng321@huawei.com>

From: Fuyun Liang <liangfuyun1@huawei.com>

When phy exists, we use the value of phydev.autoneg to represent the
auto-negotiation state of hardware. Otherwise, we use the value of
mac.autoneg to represent it.

This patch fixes for getting a error value of auto-negotiation state in
hclge_get_autoneg().

Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: Lipeng <lipeng321@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 046f4bb..14e1054 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2172,6 +2172,10 @@ static int hclge_get_autoneg(struct hnae3_handle *handle)
 {
 	struct hclge_vport *vport = hclge_get_vport(handle);
 	struct hclge_dev *hdev = vport->back;
+	struct phy_device *phydev = hdev->hw.mac.phydev;
+
+	if (phydev)
+		return phydev->autoneg;
 
 	return hdev->hw.mac.autoneg;
 }
-- 
1.9.1

  parent reply	other threads:[~2017-12-20  8:13 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-20  8:43 [PATCH V3 net-next 00/17] add some features and fix some bugs for HNS3 driver Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 01/17] net: hns3: add support to query tqps number Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 02/17] net: hns3: add support to modify " Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 03/17] net: hns3: change the returned tqp number by ethtool -x Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 04/17] net: hns3: Free the ring_data structrue when change tqps Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 05/17] net: hns3: Get rss_size_max from configuration but not hardcode Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 06/17] net: hns3: Add a mask initialization for mac_vlan table Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 07/17] net: hns3: Add vlan offload config command Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 08/17] net: hns3: Add ethtool related offload command Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 09/17] net: hns3: Add handling vlan tag offload in bd Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 10/17] net: hns3: cleanup mac auto-negotiation state query Lipeng
2017-12-20  8:43 ` Lipeng [this message]
2017-12-20  8:43 ` [PATCH V3 net-next 12/17] net: hns3: add support for set_pauseparam Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 13/17] net: hns3: add support to update flow control settings after autoneg Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 14/17] net: hns3: add Asym Pause support to phy default features Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 15/17] net: hns3: add support for querying advertised pause frame by ethtool ethx Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 16/17] net: hns3: Increase the default depth of bucket for TM shaper Lipeng
2017-12-20  8:43 ` [PATCH V3 net-next 17/17] net: hns3: change TM sched mode to TC-based mode when SRIOV enabled Lipeng
2017-12-20 19:28 ` [PATCH V3 net-next 00/17] add some features and fix some bugs for HNS3 driver David Miller
2017-12-21  1:30   ` lipeng (Y)
2017-12-21  4:04     ` David Miller
2017-12-21  6:57       ` lipeng (Y)
2017-12-21 15:08         ` David Miller
2017-12-21  2:27   ` lipeng (Y)
2017-12-21  2:43     ` Hanjun Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1513759399-40915-12-git-send-email-lipeng321@huawei.com \
    --to=lipeng321@huawei.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=netdev@vger.kernel.org \
    --cc=salil.mehta@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox