diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/brcm80211/sys/wlc_ampdu.h | |
| parent | Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (diff) | |
| parent | staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. (diff) | |
| download | linux-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz linux-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_ampdu.h')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_ampdu.h | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h new file mode 100644 index 000000000000..c721b16cc706 --- /dev/null +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010 Broadcom Corporation + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _wlc_ampdu_h_ +#define _wlc_ampdu_h_ + +extern ampdu_info_t *wlc_ampdu_attach(wlc_info_t *wlc); +extern void wlc_ampdu_detach(ampdu_info_t *ampdu); +extern bool wlc_ampdu_cap(ampdu_info_t *ampdu); +extern int wlc_ampdu_set(ampdu_info_t *ampdu, bool on); +extern int wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **aggp, + int prec); +extern void wlc_ampdu_dotxstatus(ampdu_info_t *ampdu, struct scb *scb, void *p, + tx_status_t *txs); +extern void wlc_ampdu_reset(ampdu_info_t *ampdu); +extern void wlc_ampdu_macaddr_upd(wlc_info_t *wlc); +extern void wlc_ampdu_shm_upd(ampdu_info_t *ampdu); + +extern u8 wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb, + ratespec_t rspec, int phylen); +extern void scb_ampdu_cleanup(ampdu_info_t *ampdu, struct scb *scb); +#ifdef WLC_HIGH_ONLY +extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1, + u32 s2); +#endif + +#endif /* _wlc_ampdu_h_ */ |