diff options
| author | merge <null@invalid> | 2009-01-19 20:44:45 +0000 |
|---|---|---|
| committer | Andy Green <agreen@cpc3-nthc5-0-0-cust764.nrth.cable.ntl.com> | 2009-01-19 20:44:45 +0000 |
| commit | 1655ed19960a1597a93540a45e4a554c1139cf63 (patch) | |
| tree | 575bd68bb3be7eff0366375ec2f76fcf0b57983c /drivers/ar6000/ar6000/ar6000_drv.c | |
| parent | 66282b96965c5bdc80a71f09f47cf861e37108c9 (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-update-gta02-default-configura-1232397413
pending-tracking-hist top was MERGE-via-stable-tracking-update-gta02-default-configura-1232397413 / fdaef96a49003c3e907629757f489585ea6708ab ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-update-gta02-default-configura
stable-tracking-hist top was update-gta02-default-configura / ae4b4dc366b578f90cd85eda9348d3f7e585670c ... parent commitmessage:
From: Werner Almesberger <werner@openmoko.org>
update GTA02 default configurations
Add the settings introduced by the previous two patches to the default
configurations.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'drivers/ar6000/ar6000/ar6000_drv.c')
| -rw-r--r-- | drivers/ar6000/ar6000/ar6000_drv.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/ar6000/ar6000/ar6000_drv.c b/drivers/ar6000/ar6000/ar6000_drv.c index 77730b2a3ac..06042367379 100644 --- a/drivers/ar6000/ar6000/ar6000_drv.c +++ b/drivers/ar6000/ar6000/ar6000_drv.c @@ -117,6 +117,12 @@ unsigned int _mboxnum = HTC_MAILBOX_NUM_MAX; unsigned int mboxnum = HTC_MAILBOX_NUM_MAX; #endif +#ifdef CONFIG_AR6000_WLAN_RESET +unsigned int resetok = 1; +#else +unsigned int resetok = 0; +#endif + #ifdef DEBUG A_UINT32 g_dbg_flags = DBG_DEFAULTS; unsigned int debugflags = 0; @@ -124,7 +130,6 @@ int debugdriver = 1; unsigned int debughtc = 128; unsigned int debugbmi = 1; unsigned int debughif = 2; -unsigned int resetok = 1; unsigned int txcreditsavailable[HTC_MAILBOX_NUM_MAX] = {0}; unsigned int txcreditsconsumed[HTC_MAILBOX_NUM_MAX] = {0}; unsigned int txcreditintrenable[HTC_MAILBOX_NUM_MAX] = {0}; @@ -155,9 +160,6 @@ MODULE_PARM(txcreditintrenable, "0-3i"); MODULE_PARM(txcreditintrenableaggregate, "0-3i"); #endif -#else -unsigned int resetok = 1; - #endif /* DEBUG */ unsigned int tx_attempt[HTC_MAILBOX_NUM_MAX] = {0}; @@ -402,6 +404,9 @@ ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar) if (!ar->dbglog_init_done) return A_ERROR; +#ifndef CONFIG_AR6000_WLAN_DEBUG + return 0; +#endif AR6000_SPIN_LOCK(&ar->arLock, 0); |