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

Commit 1ca47e68 authored by Seth Forshee's avatar Seth Forshee Committed by John W. Linville
Browse files

brcm80211: Convert log message levels to debug levels 



In preparation for enhancements to debug and trace support, convert the
message levels to debug levels which will be used for enabling
categories of debug messages. The two message levels are little-used
anyway and are combined into the BRCM_DL_INFO debug level.

Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Tested-by: default avatarDaniel Wagner <wagi@monom.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f5c4f108

drivers/net/wireless/brcm80211/brcmsmac/ampdu.c

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
			wiphy_err(wiphy, "%s: ampdu tx phy error (0x%x)\n",

				  __func__, txs->phyerr);



			if (brcm_msg_level & LOG_ERROR_VAL) {

			if (brcm_msg_level & BRCM_DL_INFO) {

				brcmu_prpkt("txpkt (AMPDU)", p);

				brcms_c_print_txdesc((struct d11txh *) p->data);

			}

drivers/net/wireless/brcm80211/brcmsmac/main.c

+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ struct edcf_acparam { 
/* debug/trace */

uint brcm_msg_level =

#if defined(DEBUG)

	LOG_ERROR_VAL;

	BRCM_DL_INFO;

#else

	0;

#endif				/* DEBUG */
@@ -902,7 +902,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) 
	mcl = le16_to_cpu(txh->MacTxControlLow);



	if (txs->phyerr) {

		if (brcm_msg_level & LOG_ERROR_VAL) {

		if (brcm_msg_level & BRCM_DL_INFO) {

			wiphy_err(wlc->wiphy, "phyerr 0x%x, rate 0x%x\n",

				  txs->phyerr, txh->MainRates);

			brcms_c_print_txdesc(txh);

drivers/net/wireless/brcm80211/brcmsmac/types.h

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ 


#define BCMMSG(dev, fmt, args...)		\

do {						\

	if (brcm_msg_level & LOG_TRACE_VAL)	\

	if (brcm_msg_level & BRCM_DL_INFO)	\

		wiphy_err(dev, "%s: " fmt, __func__, ##args);	\

} while (0)

drivers/net/wireless/brcm80211/include/defs.h

+2 −3
Original line number Diff line number Diff line
@@ -78,9 +78,8 @@ 
#define PM_OFF	0

#define PM_MAX	1



/* Message levels */

#define LOG_ERROR_VAL		0x00000001

#define LOG_TRACE_VAL		0x00000002

/* Debug levels */

#define BRCM_DL_INFO		0x00000001



#define PM_OFF	0

#define PM_MAX	1