igb: add check for fiber/serdes devices to igb_set_spd_dplx;
Subsystems (2)
PATCH 1/1 igb: add check for fiber/serdes devices to igb_set_spd_dplx;
From: Carolyn Wyborny <[email protected]>
Signed-off-by Carolyn Wyborny <[email protected]>
Tested-by Emil Tantilov <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/igb/igb_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/net/igb/igb_main.c +7 -0
@@ -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 ;
From: Jeff Kirsher <[email protected]>
Date: Wed, 13 Oct 2010 01:27:02 -0700
Quoted 5 lines
From: Carolyn Wyborny <[email protected]>
Signed-off-by Carolyn Wyborny <[email protected]>Tested-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.