Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8796cbe authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: rename EPI_VERSION_STR macro 



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: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 67a646f0

drivers/staging/brcm80211/brcmfmac/dhd.h

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+2 −3
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */