diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-02-06 13:55:44 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-02-06 13:55:44 -0500 |
commit | b3b66ae4c8aff0636521034d824b8953dc617335 (patch) | |
tree | 0a4c792efd730a59adc79d0d2476e0a4b3aa2f2e /drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h | |
parent | bf414b369f158bb527f9f29174ada815f961b44c (diff) | |
parent | 7b2385b95363c9ff49801c19cba2489a05bd6672 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h index 9358bd5ebd35..947ccacf43e6 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h @@ -68,6 +68,8 @@ struct brcms_info { spinlock_t lock; /* per-device perimeter lock */ spinlock_t isr_lock; /* per-device ISR synchronization lock */ + /* tx flush */ + wait_queue_head_t tx_flush_wq; /* timer related fields */ atomic_t callbacks; /* # outstanding callback functions */ @@ -100,7 +102,6 @@ extern struct brcms_timer *brcms_init_timer(struct brcms_info *wl, extern void brcms_free_timer(struct brcms_timer *timer); extern void brcms_add_timer(struct brcms_timer *timer, uint ms, int periodic); extern bool brcms_del_timer(struct brcms_timer *timer); -extern void brcms_msleep(struct brcms_info *wl, uint ms); extern void brcms_dpc(unsigned long data); extern void brcms_timer(struct brcms_timer *t); extern void brcms_fatal_error(struct brcms_info *wl); |