diff options
| author | Carolyn Wyborny <carolyn.wyborny@intel.com> | 2010-10-12 22:27:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-14 10:49:44 -0700 |
| commit | cd2638a86c7b90e77ce623c09de2a26177f2a5c1 (patch) | |
| tree | 53393f089bdacbdb054ce7c4d85252c1c4ac0e4b | |
| parent | 5d5b7c39cfdc459c079ed75b65a537f40ffb82da (diff) | |
| download | linux-cd2638a86c7b90e77ce623c09de2a26177f2a5c1.tar.bz2 | |
igb: add check for fiber/serdes devices to igb_set_spd_dplx;
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/igb/igb_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 55edcb74abf4..5b04eff2fd23 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -6115,6 +6115,13 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u16 spddplx) mac->autoneg = 0; + /* Fiber NIC's only allow 1000 Gbps Full duplex */ + if ((adapter->hw.phy.media_type == e1000_media_type_internal_serdes) && + spddplx != (SPEED_1000 + DUPLEX_FULL)) { + dev_err(&pdev->dev, "Unsupported Speed/Duplex configuration\n"); + return -EINVAL; + } + switch (spddplx) { case SPEED_10 + DUPLEX_HALF: mac->forced_speed_duplex = ADVERTISE_10_HALF; |