diff options
| author | Greg Goldman <ggoldman@broadcom.com> | 2011-06-29 14:34:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:45 -0800 |
| commit | e1fa2ad75d2dcebef7fca25df8c3928a0923089c (patch) | |
| tree | 8647432d4521ea7b6c1442b8258dd812fa5ee993 /drivers/net/wireless/bcmdhd/dhd.h | |
| parent | 6fc138e383e9dd2b7f1f4b5e73df994292f455c4 (diff) | |
Update to 5.90.125.33
Add logic to get MAC address before firmware is loaded
Change-Id: I2151a0fcc5aab914cfec8bfedf761b9f06445d1a
Signed-off-by: Howard M. Harte <hharte@broadcom.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/dhd.h')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd.h b/drivers/net/wireless/bcmdhd/dhd.h index 4a7f571c766a..260632677f5c 100644 --- a/drivers/net/wireless/bcmdhd/dhd.h +++ b/drivers/net/wireless/bcmdhd/dhd.h @@ -248,6 +248,9 @@ typedef struct dhd_cmn { #endif /* DHDTHREAD */ #define DHD_IF_VIF 0x01 /* Virtual IF (Hidden from user) */ +unsigned long dhd_os_spin_lock(dhd_pub_t *pub); +void dhd_os_spin_unlock(dhd_pub_t *pub, unsigned long flags); + /* Wakelock Functions */ extern int dhd_os_wake_lock(dhd_pub_t *pub); extern int dhd_os_wake_unlock(dhd_pub_t *pub); @@ -280,9 +283,6 @@ inline static void MUTEX_UNLOCK_SOFTAP_SET(dhd_pub_t * dhdp) #define DHD_OS_WAKE_LOCK_TIMEOUT(pub) dhd_os_wake_lock_timeout(pub) #define DHD_OS_WAKE_LOCK_TIMEOUT_ENABLE(pub) dhd_os_wake_lock_timeout_enable(pub) -extern unsigned long dhd_os_spin_lock(dhd_pub_t *pub); -extern void dhd_os_spin_unlock(dhd_pub_t *pub, unsigned long flags); - /* interface operations (register, remove) should be atomic, use this lock to prevent race * condition among wifi on/off and interface operation functions |