diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2011-09-16 02:27:56 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-10-05 05:54:46 -0400 |
commit | 837617a580d5b61ca7a0a0cfe74ba9276e94c0ed (patch) | |
tree | 3ff1e4efaa76276f140b187b082855497c8c908c | |
parent | 217995ecd04999284ba4c5745e789314ea99e54f (diff) |
ixgbe: do not disable flow control in ixgbe_check_mac_link
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>
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 5 | ||||
-rw-r--r-- | 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 fa079bbab89a..56c32dc16e7f 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, | |||
650 | (ixgbe_validate_link_ready(hw) != 0)) | 650 | (ixgbe_validate_link_ready(hw) != 0)) |
651 | *link_up = false; | 651 | *link_up = false; |
652 | 652 | ||
653 | /* if link is down, zero out the current_mode */ | ||
654 | if (*link_up == false) { | ||
655 | hw->fc.current_mode = ixgbe_fc_none; | ||
656 | hw->fc.fc_was_autonegged = false; | ||
657 | } | ||
658 | out: | 653 | out: |
659 | return 0; | 654 | return 0; |
660 | } | 655 | } |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 59cd54cfdc1f..35fa444556b3 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, | |||
3095 | else | 3095 | else |
3096 | *speed = IXGBE_LINK_SPEED_UNKNOWN; | 3096 | *speed = IXGBE_LINK_SPEED_UNKNOWN; |
3097 | 3097 | ||
3098 | /* if link is down, zero out the current_mode */ | ||
3099 | if (*link_up == false) { | ||
3100 | hw->fc.current_mode = ixgbe_fc_none; | ||
3101 | hw->fc.fc_was_autonegged = false; | ||
3102 | } | ||
3103 | |||
3104 | return 0; | 3098 | return 0; |
3105 | } | 3099 | } |
3106 | 3100 | ||