These changes are fixing some build problem I had when compiling
without BCMDBG being set.
Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
v1 -> v2: * rebase the patch on staging-next
* the problems in wlc_bmac.c are fixed now
* added compile fix in dhd_common.c
---
drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 2 +-
drivers/staging/brcm80211/brcmfmac/dhd_common.c | 2 +-
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 6 ++++++
drivers/staging/brcm80211/include/bcmsdh.h | 2 +-
4 files changed, 9 insertions(+), 3 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/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 5165251..eeabbc3 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -57,8 +57,8 @@ void dhd_iscan_unlock(void);
#error DHD_SDALIGN is not a power of 2!
#endif
-#ifdef DHD_DEBUG
#define EPI_VERSION_STR "4.218.248.5"
+#ifdef DHD_DEBUG
const char dhd_version[] =
"Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled on " __DATE__
" at " __TIME__;
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index bba84eb..eaeda3c 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -6317,6 +6317,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],
@@ -6328,6 +6329,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
}
}
@@ -6597,7 +6601,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
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
