diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 20:16:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 20:16:12 +0100 |
| commit | e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38 (patch) | |
| tree | d77b0c7f1f8890fb75098c550277fe9b81c340b3 /drivers/net/wireless/brcm80211/brcmsmac/pub.h | |
| parent | 36eed56a8f7e1bd7fb5014ea0e702708e1702f30 (diff) | |
| parent | 9e97d14b4923da524d202f2e005d5d30b70db9d6 (diff) | |
| download | talos-op-linux-e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38.tar.gz talos-op-linux-e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38.zip | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/pub.h')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/pub.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pub.h b/drivers/net/wireless/brcm80211/brcmsmac/pub.h index 4fb2834f4e64..b0f14b7b8616 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/pub.h +++ b/drivers/net/wireless/brcm80211/brcmsmac/pub.h @@ -314,8 +314,6 @@ extern void brcms_c_associate_upd(struct brcms_c_info *wlc, bool state); extern void brcms_c_scan_start(struct brcms_c_info *wlc); extern void brcms_c_scan_stop(struct brcms_c_info *wlc); extern int brcms_c_get_curband(struct brcms_c_info *wlc); -extern void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, - bool drop); extern int brcms_c_set_channel(struct brcms_c_info *wlc, u16 channel); extern int brcms_c_set_rate_limit(struct brcms_c_info *wlc, u16 srl, u16 lrl); extern void brcms_c_get_current_rateset(struct brcms_c_info *wlc, @@ -332,5 +330,6 @@ extern int brcms_c_set_tx_power(struct brcms_c_info *wlc, int txpwr); extern int brcms_c_get_tx_power(struct brcms_c_info *wlc); extern bool brcms_c_check_radio_disabled(struct brcms_c_info *wlc); extern void brcms_c_mute(struct brcms_c_info *wlc, bool on); +extern bool brcms_c_tx_flush_completed(struct brcms_c_info *wlc); #endif /* _BRCM_PUB_H_ */ |
