From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Sasha Neftin <sasha.neftin@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
Aaron Brown <aaron.f.brown@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 13/13] igc: Remove checking media type during MAC initialization
Date: Mon, 29 Jun 2020 18:27:48 -0700 [thread overview]
Message-ID: <20200630012748.518705-14-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20200630012748.518705-1-jeffrey.t.kirsher@intel.com>
From: Sasha Neftin <sasha.neftin@intel.com>
i225 device support only copper mode.
There is no point to check media type in the
igc_config_fc_after_link_up() method.
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igc/igc_mac.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_mac.c b/drivers/net/ethernet/intel/igc/igc_mac.c
index 9a5e44ef45f4..b47e7b0a6398 100644
--- a/drivers/net/ethernet/intel/igc/igc_mac.c
+++ b/drivers/net/ethernet/intel/igc/igc_mac.c
@@ -468,10 +468,8 @@ s32 igc_config_fc_after_link_up(struct igc_hw *hw)
* so we had to force link. In this case, we need to force the
* configuration of the MAC to match the "fc" parameter.
*/
- if (mac->autoneg_failed) {
- if (hw->phy.media_type == igc_media_type_copper)
- ret_val = igc_force_mac_fc(hw);
- }
+ if (mac->autoneg_failed)
+ ret_val = igc_force_mac_fc(hw);
if (ret_val) {
hw_dbg("Error forcing flow control settings\n");
@@ -483,7 +481,7 @@ s32 igc_config_fc_after_link_up(struct igc_hw *hw)
* has completed, and if so, how the PHY and link partner has
* flow control configured.
*/
- if (hw->phy.media_type == igc_media_type_copper && mac->autoneg) {
+ if (mac->autoneg) {
/* Read the MII Status Register and check to see if AutoNeg
* has completed. We read this twice because this reg has
* some "sticky" (latched) bits.
--
2.26.2
next prev parent reply other threads:[~2020-06-30 1:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 1:27 [net-next v2 00/13][pull request] 1GbE Intel Wired LAN Driver Updates 2020-06-29 Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 01/13] igc: Add initial EEE support Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 02/13] igc: Add initial LTR support Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 03/13] igc: Clean up Rx timestamping logic Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 04/13] igc: Remove duplicate code in Tx timestamp handling Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 05/13] igc: Check __IGC_PTP_TX_IN_PROGRESS instead of ptp_tx_skb Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 06/13] igc: Remove UDP filter setup in PTP code Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 07/13] igc: Refactor igc_ptp_set_timestamp_mode() Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 08/13] igc: Fix Rx timestamp disabling Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 09/13] igc: Add LPI counters Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 10/13] igc: Remove TCP segmentation TX fail counter Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 11/13] igc: Refactor the igc_power_down_link() Jeff Kirsher
2020-06-30 1:27 ` [net-next v2 12/13] igc: Remove unneeded check for copper media type Jeff Kirsher
2020-06-30 1:27 ` Jeff Kirsher [this message]
2020-06-30 19:34 ` [net-next v2 00/13][pull request] 1GbE Intel Wired LAN Driver Updates 2020-06-29 David Miller
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=20200630012748.518705-14-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=aaron.f.brown@intel.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sasha.neftin@intel.com \
--cc=sassmann@redhat.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;
as well as URLs for NNTP newsgroup(s).