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

Commit 26e80554 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: fix build with BCMDBG unset. 



These changes are fixing some build problem I had when compiling
without BCMDBG being set.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66308897

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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__;

drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

	}

drivers/staging/brcm80211/include/bcmsdh.h

+1 −1
Original line number Diff line number Diff line
@@ -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