浏览代码

ixgb: Write RA register high word first, increment version

We need to disable the AV bit before flushing the low register.

Signed-off-by: <aaron.k.salter@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Aaron Salter 18 年之前
父节点
当前提交
a3ffab8758
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 2 1
      drivers/net/ixgb/ixgb_hw.c
  2. 1 1
      drivers/net/ixgb/ixgb_main.c

+ 2 - 1
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. */
 	/* Zero out the other 15 receive addresses. */
 	DEBUGOUT("Clearing RAR[1-15]\n");
 	DEBUGOUT("Clearing RAR[1-15]\n");
 	for(i = 1; i < IXGB_RAR_ENTRIES; i++) {
 	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) + 1), 0);
+		IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
 	}
 	}
 
 
 	return;
 	return;

+ 1 - 1
drivers/net/ixgb/ixgb_main.c

@@ -36,7 +36,7 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
 #else
 #else
 #define DRIVERNAPI "-NAPI"
 #define DRIVERNAPI "-NAPI"
 #endif
 #endif
-#define DRV_VERSION		"1.0.117-k2"DRIVERNAPI
+#define DRV_VERSION		"1.0.126-k2"DRIVERNAPI
 char ixgb_driver_version[] = DRV_VERSION;
 char ixgb_driver_version[] = DRV_VERSION;
 static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";