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

Commit 9990fa3c authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik
Browse files

e1000: simplify case handling gigabit at half duplex 



Remvoe duplicate code handling erraneous user supplied wrong case
of gigabit speed with half duplex.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 62d0cfcb

drivers/net/e1000/e1000_param.c

+3 −12
Original line number Diff line number Diff line
@@ -760,22 +760,13 @@ e1000_check_copper_options(struct e1000_adapter *adapter) 
	case SPEED_1000:

		DPRINTK(PROBE, INFO, "1000 Mbps Speed specified without "

			"Duplex\n");

		DPRINTK(PROBE, INFO,

			"Using Autonegotiation at 1000 Mbps "

			"Full Duplex only\n");

		adapter->hw.autoneg = adapter->fc_autoneg = 1;

		adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;

		break;

		goto full_duplex_only;

	case SPEED_1000 + HALF_DUPLEX:

		DPRINTK(PROBE, INFO,

			"Half Duplex is not supported at 1000 Mbps\n");

		DPRINTK(PROBE, INFO,

			"Using Autonegotiation at 1000 Mbps "

			"Full Duplex only\n");

		adapter->hw.autoneg = adapter->fc_autoneg = 1;

		adapter->hw.autoneg_advertised = ADVERTISE_1000_FULL;

		break;

		/* fall through */

	case SPEED_1000 + FULL_DUPLEX:

full_duplex_only:

		DPRINTK(PROBE, INFO,

		       "Using Autonegotiation at 1000 Mbps Full Duplex only\n");

		adapter->hw.autoneg = adapter->fc_autoneg = 1;