From 5b66c250a8ece6f412e739a9afa91bb56d9a6802 Mon Sep 17 00:00:00 2001
From: Aaron Salter <aaron.k.salter@intel.com>
Date: Sat, 6 Jan 2007 09:51:41 -0800
Subject: [PATCH] --- yaml --- r: 45379 b: refs/heads/master c:
 a3ffab87588234e41248d8cebd8cec88db605d3c h: refs/heads/master i:   45377:
 60faccad2cbc540d7b71c891c57bbb0592b4560a   45375:
 6edf834af2d3be26f28aa9b951f2df0793994352 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/ixgb/ixgb_hw.c   | 3 ++-
 trunk/drivers/net/ixgb/ixgb_main.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a21bf1850cc9..a461d429af55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfd341e4e467d146901a3accb761f04fda535433
+refs/heads/master: a3ffab87588234e41248d8cebd8cec88db605d3c
diff --git a/trunk/drivers/net/ixgb/ixgb_hw.c b/trunk/drivers/net/ixgb/ixgb_hw.c
index 02089b64e42c..ecbf45861c68 100644
--- a/trunk/drivers/net/ixgb/ixgb_hw.c
+++ b/trunk/drivers/net/ixgb/ixgb_hw.c
@@ -399,8 +399,9 @@ ixgb_init_rx_addrs(struct ixgb_hw *hw)
 	/* Zero out the other 15 receive addresses. */
 	DEBUGOUT("Clearing RAR[1-15]\n");
 	for(i = 1; i < IXGB_RAR_ENTRIES; i++) {
-		IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
+		/* Write high reg first to disable the AV bit first */
 		IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
+		IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
 	}
 
 	return;
diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c
index 16317b58f741..a083a9189230 100644
--- a/trunk/drivers/net/ixgb/ixgb_main.c
+++ b/trunk/drivers/net/ixgb/ixgb_main.c
@@ -36,7 +36,7 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION		"1.0.117-k2"DRIVERNAPI
+#define DRV_VERSION		"1.0.126-k2"DRIVERNAPI
 char ixgb_driver_version[] = DRV_VERSION;
 static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";