From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Emil Tantilov <emil.s.tantilov@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 08/11] ixgbe: do not disable flow control in ixgbe_check_mac_link
Date: Thu, 29 Sep 2011 22:24:48 -0700 [thread overview]
Message-ID: <1317360291-5576-9-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1317360291-5576-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Emil Tantilov <emil.s.tantilov@intel.com>
Disabling flow control in ixgbe_check_mac_link() results in incorrect
reporting by ethtool when link goes down, so remove it.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 5 -----
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 6 ------
2 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
index fa079bb..56c32dc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
@@ -650,11 +650,6 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
(ixgbe_validate_link_ready(hw) != 0))
*link_up = false;
- /* if link is down, zero out the current_mode */
- if (*link_up == false) {
- hw->fc.current_mode = ixgbe_fc_none;
- hw->fc.fc_was_autonegged = false;
- }
out:
return 0;
}
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 59cd54c..35fa444 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -3095,12 +3095,6 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
else
*speed = IXGBE_LINK_SPEED_UNKNOWN;
- /* if link is down, zero out the current_mode */
- if (*link_up == false) {
- hw->fc.current_mode = ixgbe_fc_none;
- hw->fc.fc_was_autonegged = false;
- }
-
return 0;
}
--
1.7.6.2
next prev parent reply other threads:[~2011-09-30 5:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 5:24 [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2011-09-30 5:24 ` [net-next 01/11] e1000e: make function tables const Jeff Kirsher
2011-09-30 5:24 ` [net-next 02/11] ixgbe: prevent link checks while resetting Jeff Kirsher
2011-09-30 5:24 ` [net-next 03/11] ixgbe: clear the data field in ixgbe_read_i2c_byte_generic Jeff Kirsher
2011-09-30 5:24 ` [net-next 04/11] ixgbe: remove return code for functions that always return 0 Jeff Kirsher
2011-09-30 5:24 ` [net-next 05/11] ixgbe: fix driver version initialization in firmware Jeff Kirsher
2011-09-30 5:24 ` [net-next 06/11] ixgbe: add support for new 82599 device Jeff Kirsher
2011-09-30 5:24 ` [net-next 07/11] ixgbe: send MFLCN to ethtool Jeff Kirsher
2011-09-30 5:24 ` Jeff Kirsher [this message]
2011-09-30 5:24 ` [net-next 09/11] ixgbe: get pauseparam autoneg Jeff Kirsher
2011-09-30 5:24 ` [net-next 10/11] ixgbe: remove instances of ixgbe_phy_aq for 82598 and 82599 Jeff Kirsher
2011-09-30 5:24 ` [net-next 11/11] ixgbe: allow eeprom writes via ethtool Jeff Kirsher
2011-09-30 13:52 ` Ben Hutchings
2011-09-30 18:35 ` [net-next 00/11][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
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=1317360291-5576-9-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=emil.s.tantilov@intel.com \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
/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).