staging: brcm80211: fix build with BCMDBG unset.
authorHauke Mehrtens <hauke@hauke-m.de>
Wed, 9 Feb 2011 20:21:39 +0000 (21:21 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Feb 2011 23:10:46 +0000 (15:10 -0800)
These changes are fixing some build problem I had when compiling
without BCMDBG being set.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
drivers/staging/brcm80211/brcmfmac/dhd_common.c
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
drivers/staging/brcm80211/include/bcmsdh.h

index 89059dd8088bc2e528a90417b7ad361c38512169..b020a301341f2f3774aa60600499d319a325e111 100644 (file)
@@ -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
 
index 5165251cfe2f617e2cec6e6c6f55725c5c76d7db..eeabbc3334d4ab5230c1636ecfd354966940b9bb 100644 (file)
@@ -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__;
index d64171ff12aa88e0f93834fea9684ed3aa5be0f9..b05a491f3f62106a8f95fb7daad5cda28be2d183 100644 (file)
@@ -6327,6 +6327,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],
@@ -6338,6 +6339,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
                }
        }
 
@@ -6607,7 +6611,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);
        }
 
index 90a600de7a3a78a62653541b0268ce21a8bda9ef..aa5f372d58ccc568a4688604676719da40a16ba0 100644 (file)
@@ -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