leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: brcm80211: rename EPI_VERSION_STR macro

Browse Source 
The fullmac version macro has been renamed and moved to dhd.h to
get rid of having it defined in two separate c source files.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel 2011-06-29 16:47:39 -07:00 committed by Greg Kroah-Hartman
parent 67a646f0d3
commit c8796cbeab
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/dhd.h
View File

@ -21,6 +21,8 @@
#ifndef _dhd_h_ #ifndef _dhd_h_
#define _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_SMLEN 256 /* "small" ioctl buffer required */
#define BRCMF_C_IOCTL_MEDLEN 1536 /* "med" ioctl buffer required */ #define BRCMF_C_IOCTL_MEDLEN 1536 /* "med" ioctl buffer required */
#define BRCMF_C_IOCTL_MAXLEN 8192 #define BRCMF_C_IOCTL_MAXLEN 8192

5
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View File

@ -36,15 +36,14 @@ int brcmf_msg_level;
char brcmf_fw_path[MOD_PARAM_PATHLEN]; char brcmf_fw_path[MOD_PARAM_PATHLEN];
char brcmf_nv_path[MOD_PARAM_PATHLEN]; char brcmf_nv_path[MOD_PARAM_PATHLEN];
#define EPI_VERSION_STR "4.218.248.5"
#define MSGTRACE_VERSION 1 #define MSGTRACE_VERSION 1
#ifdef BCMDBG #ifdef BCMDBG
const char brcmf_version[] = 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__; " at " __TIME__;
#else #else
const char brcmf_version[] = "Dongle Host Driver, version " EPI_VERSION_STR; const char brcmf_version[] = "Dongle Host Driver, version " BRCMF_VERSION_STR;
#endif #endif
/* IOVar table */ /* IOVar table */

3
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View File

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