From 36d1b4998657273cb665dac44e0b80a967c6382e Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Thu, 5 Jan 2006 22:45:44 -0800
Subject: [PATCH] --- yaml --- r: 17104 b: refs/heads/master c:
 32a4ec97461f00aa63747fc8978011ea771bd543 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/e1000/e1000_param.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bd36b972bec5..84d8f0852d64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 504ddff4c0b8e31fa2a2775d6d484faeb126a265
+refs/heads/master: 32a4ec97461f00aa63747fc8978011ea771bd543
diff --git a/trunk/drivers/net/e1000/e1000_param.c b/trunk/drivers/net/e1000/e1000_param.c
index 38695d5b4637..ccbbe5ad8e0f 100644
--- a/trunk/drivers/net/e1000/e1000_param.c
+++ b/trunk/drivers/net/e1000/e1000_param.c
@@ -545,7 +545,7 @@ e1000_check_fiber_options(struct e1000_adapter *adapter)
 static void __devinit
 e1000_check_copper_options(struct e1000_adapter *adapter)
 {
-	int speed, dplx;
+	int speed, dplx, an;
 	int bd = adapter->bd_number;
 
 	{ /* Speed */
@@ -641,8 +641,12 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
 					 .p = an_list }}
 		};
 
-		int an = AutoNeg[bd];
-		e1000_validate_option(&an, &opt, adapter);
+		if (num_AutoNeg > bd) {
+			an = AutoNeg[bd];
+			e1000_validate_option(&an, &opt, adapter);
+		} else {
+			an = opt.def;
+		}
 		adapter->hw.autoneg_advertised = an;
 	}