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

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

staging: brcm80211: further renaming in fullmac sources 



couple of items needed renaming to more consistent naming convention.

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 51851250

drivers/staging/brcm80211/brcmfmac/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ ccflags-y := \ 
	-DBCMPLATFORM_BUS	\

	-DBCMSDIO		\

	-DBRCM_FULLMAC		\

	-DDHD_FIRSTREAD=64	\

	-DBRCMF_FIRSTREAD=64	\

	-DDHD_SCHED		\

	-DDHD_SDALIGN=64	\

	-DBRCMF_SDALIGN=64	\

	-DEMBEDDED_PLATFORM	\

	-DMAX_HDR_READ=64	\

	-DMMC_SDIO_ABORT	\

drivers/staging/brcm80211/brcmfmac/dhd.h

+4 −4
Original line number Diff line number Diff line
@@ -725,20 +725,20 @@ typedef struct { 
} bcmevent_name_t;



#if defined(CONFIG_PM_SLEEP)

extern atomic_t dhd_mmc_suspend;

extern atomic_t brcmf_mmc_suspend;

#define DHD_PM_RESUME_WAIT_INIT(a) DECLARE_WAIT_QUEUE_HEAD(a);

#define _DHD_PM_RESUME_WAIT(a, b) do { \

		int retry = 0; \

		while (atomic_read(&dhd_mmc_suspend) && retry++ != b) { \

		while (atomic_read(&brcmf_mmc_suspend) && retry++ != b) { \

			wait_event_timeout(a, false, HZ/100); \

		} \

	}	while (0)

#define DHD_PM_RESUME_WAIT(a)	_DHD_PM_RESUME_WAIT(a, 30)

#define DHD_PM_RESUME_WAIT_FOREVER(a)	_DHD_PM_RESUME_WAIT(a, ~0)

#define DHD_PM_RESUME_RETURN_ERROR(a)	\

	do { if (atomic_read(&dhd_mmc_suspend)) return a; } while (0)

	do { if (atomic_read(&brcmf_mmc_suspend)) return a; } while (0)

#define DHD_PM_RESUME_RETURN	do { \

	if (atomic_read(&dhd_mmc_suspend)) \

	if (atomic_read(&brcmf_mmc_suspend)) \

		return; \

	} while (0)

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ 
#ifndef _dhd_bus_h_

#define _dhd_bus_h_



/* Packet alignment for most efficient SDIO (can change based on platform) */

#ifndef BRCMF_SDALIGN

#define BRCMF_SDALIGN	32

#endif

#if !ISPOWEROF2(BRCMF_SDALIGN)

#error BRCMF_SDALIGN is not a power of 2!

#endif



/*

 * Exported from dhd bus module (dhd_usb, dhd_sdio)

 */

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+1 −9
Original line number Diff line number Diff line
@@ -84,16 +84,8 @@ struct brcmf_proto_bdc_header { 
int wifi_get_mac_addr(unsigned char *buf);

#endif



/* Packet alignment for most efficient SDIO (can change based on platform) */

#ifndef DHD_SDALIGN

#define DHD_SDALIGN	32

#endif

#if !ISPOWEROF2(DHD_SDALIGN)

#error DHD_SDALIGN is not a power of 2!

#endif



#define RETRIES 2	/* # of retries to retrieve matching ioctl response */

#define BUS_HEADER_LEN	(16+DHD_SDALIGN) /* Must be atleast SDPCM_RESERVE

#define BUS_HEADER_LEN	(16+BRCMF_SDALIGN) /* Must be atleast SDPCM_RESERVE

					 * defined in dhd_sdio.c

					 * (amount of header tha might be added)

					 * plus any space that might be needed

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+6 −14
Original line number Diff line number Diff line
@@ -30,19 +30,12 @@ 
#define BRCM_OUI			"\x00\x10\x18"

#define DOT11_OUI_LEN			3

#define BCMILCP_BCM_SUBTYPE_EVENT	1

#define PKTFILTER_BUF_SIZE		2048



int brcmf_msg_level;

char brcmf_fw_path[MOD_PARAM_PATHLEN];

char brcmf_nv_path[MOD_PARAM_PATHLEN];



/* Packet alignment for most efficient SDIO (can change based on platform) */

#ifndef DHD_SDALIGN

#define DHD_SDALIGN	32

#endif

#if !ISPOWEROF2(DHD_SDALIGN)

#error DHD_SDALIGN is not a power of 2!

#endif



#define EPI_VERSION_STR         "4.218.248.5"

#define MSGTRACE_VERSION	1
@@ -1028,7 +1021,6 @@ void brcmf_c_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) 
	char *argv[8], *buf = 0;

	int i = 0;

	char *arg_save = 0, *arg_org = 0;

#define BUF_SIZE		2048



	arg_save = kmalloc(strlen(arg) + 1, GFP_ATOMIC);

	if (!arg_save) {
@@ -1038,7 +1030,7 @@ void brcmf_c_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) 


	arg_org = arg_save;



	buf = kmalloc(BUF_SIZE, GFP_ATOMIC);

	buf = kmalloc(PKTFILTER_BUF_SIZE, GFP_ATOMIC);

	if (!buf) {

		DHD_ERROR(("%s: kmalloc failed\n", __func__));

		goto fail;
@@ -1046,7 +1038,7 @@ void brcmf_c_pktfilter_offload_set(dhd_pub_t *dhd, char *arg) 


	memcpy(arg_save, arg, strlen(arg) + 1);



	if (strlen(arg) > BUF_SIZE) {

	if (strlen(arg) > PKTFILTER_BUF_SIZE) {

		DHD_ERROR(("Not enough buffer %d < %d\n", (int)strlen(arg),

			   (int)sizeof(buf)));

		goto fail;
@@ -1193,7 +1185,7 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) 
	uint up = 0;

	char buf[128], *ptr;

	uint power_mode = PM_FAST;

	u32 dongle_align = DHD_SDALIGN;

	u32 dongle_align = BRCMF_SDALIGN;

	u32 glom = 0;

	uint bcn_timeout = 3;

	int scan_assoc_time = 40;