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>

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 55edcb7..5b04eff 100644 (file)
--- 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;
 
 
        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;
        switch (spddplx) {
        case SPEED_10 + DUPLEX_HALF:
                mac->forced_speed_duplex = ADVERTISE_10_HALF;