Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1693916
| From | Benjamin Poirier <bpoirier@suse.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 1/5] e1000e: Fix error path in link detection |
| Date | 2017-07-21 20:40 +0200 |
| Message-ID | <u5L0d-8jy-3@gated-at.bofh.it> (permalink) |
| References | <u5IF4-708-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
In case of error from e1e_rphy(), the loop will exit early and "success"
will be set to true erroneously.
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
---
drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index d78d47b41a71..86ff0969efb6 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
s32 ret_val = 0;
u16 i, phy_status;
+ *success = false;
for (i = 0; i < iterations; i++) {
/* Some PHYs require the MII_BMSR register to be read
* twice due to the link bit being sticky. No harm doing
@@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
ret_val = e1e_rphy(hw, MII_BMSR, &phy_status);
if (ret_val)
break;
- if (phy_status & BMSR_LSTATUS)
+ if (phy_status & BMSR_LSTATUS) {
+ *success = true;
break;
+ }
if (usec_interval >= 1000)
msleep(usec_interval / 1000);
else
udelay(usec_interval);
}
- *success = (i < iterations);
-
return ret_val;
}
--
2.13.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
commit 16ecba59 breaks 82574L under heavy load. lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-18 16:40 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. Benjamin Poirier <bpoirier@suse.com> - 2017-07-19 01:20 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-19 16:20 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. Benjamin Poirier <bpoirier@suse.com> - 2017-07-20 02:10 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-20 16:10 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. Benjamin Poirier <bpoirier@suse.com> - 2017-07-21 01:50 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-21 17:30 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-21 18:10 +0200
[PATCH 4/5] e1000e: Separate signaling for link check/link up Benjamin Poirier <bpoirier@suse.com> - 2017-07-21 20:40 +0200
Re: [PATCH 4/5] e1000e: Separate signaling for link check/link up lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-21 21:00 +0200
[PATCH 5/5] e1000e: Avoid receiver overrun interrupt bursts Benjamin Poirier <bpoirier@suse.com> - 2017-07-21 20:40 +0200
Re: [PATCH 5/5] e1000e: Avoid receiver overrun interrupt bursts lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-21 20:50 +0200
[PATCH 1/5] e1000e: Fix error path in link detection Benjamin Poirier <bpoirier@suse.com> - 2017-07-21 20:40 +0200
[PATCH 2/5] e1000e: Fix wrong comment related to link detection Benjamin Poirier <bpoirier@suse.com> - 2017-07-21 20:40 +0200
[PATCH 3/5] e1000e: Fix return value test Benjamin Poirier <bpoirier@suse.com> - 2017-07-21 20:40 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. lsorense@csclub.uwaterloo.ca (Lennart Sorensen) - 2017-07-21 21:10 +0200
Re: commit 16ecba59 breaks 82574L under heavy load. Philip Prindeville <philipp_subx@redfish-solutions.com> - 2017-07-25 00:00 +0200
csiph-web