From 84cd84a38cb7961d7778694bec97c6bb3e75dfbd Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Sun, 11 Jul 2010 09:31:44 +0000
Subject: [PATCH] --- yaml --- r: 203455 b: refs/heads/master c:
 6867c843813a801d5f568b6fb006695316714f1b h: refs/heads/master i:   203453:
 9ee7e68cd21dc2d816a36b1e732c86c04cfaf6d4   203451:
 f580102cf41c2b19fffcece9556c38ea1d0b97d3   203447:
 d52be55be2699588db790a1a3279e06cc2e9dba4   203439:
 d808295b90563670cca0f7fb4a0ecffbcc7c1ae3   203423:
 bcfc0fd0627a8f6afe4573d294ddc6ed1f583077   203391:
 d5ababb0d4aae0924d0af1f44d198c5b8ac5c891 v: v3

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

diff --git a/[refs] b/[refs]
index d5d0963c5024..4a36a0162906 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2138c002173abe3e439e213e5cc03b385b20508c
+refs/heads/master: 6867c843813a801d5f568b6fb006695316714f1b
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index c91049bdaf63..e6da16a1f7bf 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -18,6 +18,7 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/stringify.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/compiler.h>
@@ -67,7 +68,10 @@
 #include "tg3.h"
 
 #define DRV_MODULE_NAME		"tg3"
-#define DRV_MODULE_VERSION	"3.111"
+#define TG3_MAJ_NUM			3
+#define TG3_MIN_NUM			111
+#define DRV_MODULE_VERSION	\
+	__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
 #define DRV_MODULE_RELDATE	"June 5, 2010"
 
 #define TG3_DEF_MAC_MODE	0
@@ -6629,7 +6633,7 @@ static void tg3_ape_driver_state_change(struct tg3 *tp, int kind)
 		apedata = tg3_ape_read32(tp, TG3_APE_HOST_INIT_COUNT);
 		tg3_ape_write32(tp, TG3_APE_HOST_INIT_COUNT, ++apedata);
 		tg3_ape_write32(tp, TG3_APE_HOST_DRIVER_ID,
-				APE_HOST_DRIVER_ID_MAGIC);
+			APE_HOST_DRIVER_ID_MAGIC(TG3_MAJ_NUM, TG3_MIN_NUM));
 		tg3_ape_write32(tp, TG3_APE_HOST_BEHAVIOR,
 				APE_HOST_BEHAV_NO_PHYLOCK);
 
diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h
index b72ac52b33fd..be7ab91f4dda 100644
--- a/trunk/drivers/net/tg3.h
+++ b/trunk/drivers/net/tg3.h
@@ -2193,7 +2193,9 @@
 #define  APE_HOST_SEG_LEN_MAGIC		 0x0000001c
 #define TG3_APE_HOST_INIT_COUNT		0x4208
 #define TG3_APE_HOST_DRIVER_ID		0x420c
-#define  APE_HOST_DRIVER_ID_MAGIC	 0xf0035100
+#define  APE_HOST_DRIVER_ID_LINUX	 0xf0000000
+#define  APE_HOST_DRIVER_ID_MAGIC(maj, min)	\
+	(APE_HOST_DRIVER_ID_LINUX | (maj & 0xff) << 16 | (min & 0xff) << 8)
 #define TG3_APE_HOST_BEHAVIOR		0x4210
 #define  APE_HOST_BEHAV_NO_PHYLOCK	 0x00000001
 #define TG3_APE_HOST_HEARTBEAT_INT_MS	0x4214