dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Tested-by: Daniel Wagner <wagi@monom.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Seth Forshee 2012-11-15 08:08:00 -06:00 committed by John W. Linville
parent f5c4f10852
commit 1ca47e687a
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
View File

@ -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);
}

4
drivers/net/wireless/brcm80211/brcmsmac/main.c
View File

@ -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);

2
drivers/net/wireless/brcm80211/brcmsmac/types.h
View File

@ -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)

5
drivers/net/wireless/brcm80211/include/defs.h
View File

@ -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