---

yaml --- r: 259807 b: refs/heads/master c: c8796cb h: refs/heads/master i: 259805: b43482a 259803: f3b3aca 259799: d2667b9 259791: 7ed4879 259775: f58ab57 v: v3
git-mirror · Jul 5, 2011 · 0c50e19 · 0c50e19
1 parent 501c86e
commit 0c50e19
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67a646f0d381f8ec3080f379651661e030b29312
+refs/heads/master: c8796cbeabba6dd946b78edea71dbee90edabbf0
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -21,6 +21,8 @@
 #ifndef _dhd_h_
 #define _dhd_h_
 
+#define BRCMF_VERSION_STR		"4.218.248.5"
+
 #define	BRCMF_C_IOCTL_SMLEN	256	/* "small" ioctl buffer required */
 #define BRCMF_C_IOCTL_MEDLEN	1536	/* "med" ioctl buffer required */
 #define	BRCMF_C_IOCTL_MAXLEN	8192

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -36,15 +36,14 @@ int brcmf_msg_level;
 char brcmf_fw_path[MOD_PARAM_PATHLEN];
 char brcmf_nv_path[MOD_PARAM_PATHLEN];
 
-#define EPI_VERSION_STR         "4.218.248.5"
 #define MSGTRACE_VERSION	1
 
 #ifdef BCMDBG
 const char brcmf_version[] =
-"Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled on " __DATE__
+"Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on " __DATE__
 " at " __TIME__;
 #else
-const char brcmf_version[] = "Dongle Host Driver, version " EPI_VERSION_STR;
+const char brcmf_version[] = "Dongle Host Driver, version " BRCMF_VERSION_STR;
 #endif
 
 /* IOVar table */

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -43,7 +43,6 @@
 #include "dhd_dbg.h"
 #include "wl_cfg80211.h"
 
-#define EPI_VERSION_STR		"4.218.248.5"
 #define ETH_P_BRCM			0x886c
 
 /* Global ASSERT type flag */
@@ -1278,7 +1277,7 @@ static int brcmf_ethtool(dhd_info_t *dhd, void *uaddr)
 		/* if dhd requested, identify ourselves */
 		if (strcmp(drvname, "?dhd") == 0) {
 			sprintf(info.driver, "dhd");
-			strcpy(info.version, EPI_VERSION_STR);
+			strcpy(info.version, BRCMF_VERSION_STR);
 		}
 
 		/* otherwise, require dongle to be up */