Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd2638a8 authored by Carolyn Wyborny's avatar Carolyn Wyborny Committed by David S. Miller
Browse files

igb: add check for fiber/serdes devices to igb_set_spd_dplx; 



Signed-off-by: default avatarCarolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d5b7c39

drivers/net/igb/igb_main.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -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) {

	switch (spddplx) {

	case SPEED_10 + DUPLEX_HALF:

	case SPEED_10 + DUPLEX_HALF:

		mac->forced_speed_duplex = ADVERTISE_10_HALF;

		mac->forced_speed_duplex = ADVERTISE_10_HALF;