Hi Hauke, Greg,
The change to wlc_bmac.c does not seem to be in sync with staging-next
since
inclusion of the RFKILL functionality. Shall I post my patches instead?
Gr. AvS
On Sat, 05 Feb 2011 19:32:46 +0100, Hauke Mehrtens <hauke@xxxxxxxxxx>
wrote:
These changes are fixing some build problem I had when compiling
without BCMDBG being set.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 2 +-
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 3 +--
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 6 ++++++
drivers/staging/brcm80211/include/bcmsdh.h | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
index 89059dd..b020a30 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
@@ -58,7 +58,7 @@ extern SDIOH_API_RC sdioh_interrupt_query(sdioh_info_t
*si, bool *onoff);
/* enable or disable SD interrupt */
extern SDIOH_API_RC sdioh_interrupt_set(sdioh_info_t *si, bool
enable_disable);
-#if defined(BCMDBG)
+#if defined(DHD_DEBUG)
extern bool sdioh_interrupt_pending(sdioh_info_t *si);
#endif
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index 80716c5..e90a83d 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -430,10 +430,9 @@ bool BCMFASTPATH wlc_dpc(struct wlc_info *wlc, bool
bounded)
if (macintstatus & MI_RFDISABLE) {
#if defined(BCMDBG)
u32 rfd = R_REG(wlc_hw->osh, ®s->phydebug) & PDBG_RFD;
-#endif
-
WL_ERROR("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n",
wlc_hw->unit, rfd);
+#endif
WLCNTINCR(wlc->pub->_cnt->rfdisable);
}
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index c2a8e72..45e9555 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -6313,6 +6313,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct
ieee80211_hw *hw,
(u16) newfragthresh;
}
}
+#if defined(BCMDBG)
} else
WL_ERROR("wl%d: %s txop invalid for rate %d\n",
wlc->pub->unit, fifo_names[queue],
@@ -6324,6 +6325,9 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct
ieee80211_hw *hw,
fifo_names[queue],
phylen, wlc->fragthresh[queue],
dur, wlc->edcf_txop[ac]);
+#else
+ }
+#endif
}
}
@@ -6593,7 +6597,9 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t
*txs, u32 frm_tx2)
if (txs->phyerr) {
WL_ERROR("phyerr 0x%x, rate 0x%x\n",
txs->phyerr, txh->MainRates);
+#if defined(BCMDBG)
wlc_print_txdesc(txh);
+#endif
wlc_print_txstatus(txs);
}
diff --git a/drivers/staging/brcm80211/include/bcmsdh.h
b/drivers/staging/brcm80211/include/bcmsdh.h
index 90a600d..aa5f372 100644
--- a/drivers/staging/brcm80211/include/bcmsdh.h
+++ b/drivers/staging/brcm80211/include/bcmsdh.h
@@ -58,7 +58,7 @@ extern int bcmsdh_intr_disable(void *sdh);
extern int bcmsdh_intr_reg(void *sdh, bcmsdh_cb_fn_t fn, void *argh);
extern int bcmsdh_intr_dereg(void *sdh);
-#if defined(BCMDBG)
+#if defined(DHD_DEBUG)
/* Query pending interrupt status from the host controller */
extern bool bcmsdh_intr_pending(void *sdh);
#endif
--
"The most merciful thing in the world, I think, is the inability of the
human
mind to correlate all its contents." - "The Call of Cthulhu"
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
