From 0c50e19ae10f6aef9ee272de813796b5eb0da678 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 29 Jun 2011 16:47:39 -0700 Subject: [PATCH] --- yaml --- r: 259807 b: refs/heads/master c: c8796cbeabba6dd946b78edea71dbee90edabbf0 h: refs/heads/master i: 259805: b43482a46daef2e3b29af89afd98a9a20beb566c 259803: f3b3acaf8fed5b1bcac3c90dc2998c770f3dde79 259799: d2667b9807c1bad4cb984402cdb29f09aaee46c7 259791: 7ed4879872ae0ecceaefbbe32b95a0fed8fd3bac 259775: f58ab5751df39de2cb1b33e74324ff07b95c8b5e v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/dhd.h | 2 ++ trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c | 5 ++--- trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5a731af0dff6..8eea2bb62f12 100644 --- 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 index 87c65f13ec68..7e19d807603c 100644 --- 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 index 22739f03744e..5207fa9a6b84 100644 --- 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 index 53279419b016..19e09bd82643 100644 --- 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 */