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

Commit 8ae74654 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

brcm80211: Use normal DEBUG define 



Current CONFIG_BRCMDBG flag when enabled does not
necessarily enable proper pr_debug output when
DEBUG is not also enabled.

Remove BCMDBG define and just use DEBUG instead.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f9972577

drivers/net/wireless/brcm80211/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.





# common flags

# common flags

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DBCMDBG

subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DDEBUG





obj-$(CONFIG_BRCMUTIL)	+= brcmutil/

obj-$(CONFIG_BRCMUTIL)	+= brcmutil/

obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -644,9 +644,9 @@ extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx); 
extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,

extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,

				       uint cmd, void *buf, uint len);

				       uint cmd, void *buf, uint len);





#ifdef BCMDBG

#ifdef DEBUG

extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);

extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);

#endif				/* BCMDBG */

#endif				/* DEBUG */





extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);

extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);

extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,

extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,

drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define BRCMF_PKT_FILTER_PATTERN_FIXED_LEN	\

#define BRCMF_PKT_FILTER_PATTERN_FIXED_LEN	\

	offsetof(struct brcmf_pkt_filter_pattern_le, mask_and_pattern)

	offsetof(struct brcmf_pkt_filter_pattern_le, mask_and_pattern)





#ifdef BCMDBG

#ifdef DEBUG

static const char brcmf_version[] =

static const char brcmf_version[] =

	"Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on "

	"Dongle Host Driver, version " BRCMF_VERSION_STR "\nCompiled on "

	__DATE__ " at " __TIME__;

	__DATE__ " at " __TIME__;
@@ -133,7 +133,7 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, 
	return p != NULL;

	return p != NULL;

}

}





#ifdef BCMDBG

#ifdef DEBUG

static void

static void

brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)

brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)

{

{
@@ -430,7 +430,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) 
		brcmf_dbg(EVENT, "\n");

		brcmf_dbg(EVENT, "\n");

	}

	}

}

}

#endif				/* BCMDBG */

#endif				/* DEBUG */





int

int

brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,

brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,
@@ -518,9 +518,9 @@ brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata, 
		break;

		break;

	}

	}





#ifdef BCMDBG

#ifdef DEBUG

	brcmf_c_show_host_event(event, event_data);

	brcmf_c_show_host_event(event, event_data);

#endif				/* BCMDBG */

#endif				/* DEBUG */





	return 0;

	return 0;

}

}

drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define BRCMF_BTA_VAL	0x1000

#define BRCMF_BTA_VAL	0x1000

#define BRCMF_ISCAN_VAL 0x2000

#define BRCMF_ISCAN_VAL 0x2000





#if defined(BCMDBG)

#if defined(DEBUG)





#define brcmf_dbg(level, fmt, ...)					\

#define brcmf_dbg(level, fmt, ...)					\

do {									\

do {									\
@@ -56,7 +56,7 @@ do { \ 
#define BRCMF_BYTES_ON()	(brcmf_msg_level & BRCMF_BYTES_VAL)

#define BRCMF_BYTES_ON()	(brcmf_msg_level & BRCMF_BYTES_VAL)

#define BRCMF_GLOM_ON()		(brcmf_msg_level & BRCMF_GLOM_VAL)

#define BRCMF_GLOM_ON()		(brcmf_msg_level & BRCMF_GLOM_VAL)





#else	/* (defined BCMDBG) || (defined BCMDBG) */

#else	/* (defined DEBUG) || (defined DEBUG) */





#define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)

#define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
@@ -66,7 +66,7 @@ do { \ 
#define BRCMF_BYTES_ON()	0

#define BRCMF_BYTES_ON()	0

#define BRCMF_GLOM_ON()		0

#define BRCMF_GLOM_ON()		0





#endif				/* defined(BCMDBG) */

#endif				/* defined(DEBUG) */





extern int brcmf_msg_level;

extern int brcmf_msg_level;

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1146,7 +1146,7 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev) 
	return pend;

	return pend;

}

}





#ifdef BCMDBG

#ifdef DEBUG

int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size)

int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size)

{

{

	int ret = 0;

	int ret = 0;
@@ -1180,4 +1180,4 @@ int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size) 




	return ret;

	return ret;

}

}

#endif				/* BCMDBG */
 
#endif				/* DEBUG */