diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-01-13 01:50:28 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 13:40:10 +0100 |
| commit | 571281972e2ca590ef160dcd6669b9f724b64283 (patch) | |
| tree | cdb4f140fee6c924257ea52d40c56c031101d018 /drivers/net/e1000/e1000_param.c | |
| parent | [PATCH] e1000: General Fixes (diff) | |
| download | linux-571281972e2ca590ef160dcd6669b9f724b64283.tar.xz linux-571281972e2ca590ef160dcd6669b9f724b64283.zip | |
[PATCH] e1000: Fix SoL/IDER link and loopback
Fix so that if a SoL/IDER session is active, do not allow operations which require a PHY reset and instead log a message.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e1000/e1000_param.c')
| -rw-r--r-- | drivers/net/e1000/e1000_param.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c index ccbbe5ad8e0f..852841f12fb9 100644 --- a/drivers/net/e1000/e1000_param.c +++ b/drivers/net/e1000/e1000_param.c @@ -584,6 +584,12 @@ e1000_check_copper_options(struct e1000_adapter *adapter) .p = dplx_list }} }; + if (e1000_check_phy_reset_block(&adapter->hw)) { + DPRINTK(PROBE, INFO, + "Link active due to SoL/IDER Session. " + "Speed/Duplex/AutoNeg parameter ignored.\n"); + return; + } if (num_Duplex > bd) { dplx = Duplex[bd]; e1000_validate_option(&dplx, &opt, adapter); |