staging: brcm80211: rename EPI_VERSION_STR macro
authorArend van Spriel <arend@broadcom.com>
Wed, 29 Jun 2011 23:47:39 +0000 (16:47 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 5 Jul 2011 16:57:21 +0000 (09:57 -0700)
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>
drivers/staging/brcm80211/brcmfmac/dhd.h
drivers/staging/brcm80211/brcmfmac/dhd_common.c
drivers/staging/brcm80211/brcmfmac/dhd_linux.c

index 87c65f13ec680f89c4a46f1a8ebf95b42c1c43aa..7e19d807603c0767d376d0e96749ab79f0bcaf93 100644 (file)
@@ -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
index 22739f03744ee790d9f3712de49f592e61bdab56..5207fa9a6b841b95e9f3a44d7265b5b690a28911 100644 (file)
@@ -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 */
index 53279419b0166cc91060be9083c8a0f8d903c4cf..19e09bd826439cff06f2b16c540ce726fd4d3ecc 100644 (file)
@@ -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 */