From a9533e7ea3c410fed2f4cd8b3e1e213e48529b75 Mon Sep 17 00:00:00 2001 From: Henry Ptasinski Date: Wed, 8 Sep 2010 21:04:42 -0700 Subject: Staging: Add initial release of brcm80211 - Broadcom 802.11n wireless LAN driver. Signed-off-by: Henry Ptasinski Cc: Brett Rudley Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/sys/wlc_ampdu.h | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 drivers/staging/brcm80211/sys/wlc_ampdu.h (limited to 'drivers/staging/brcm80211/sys/wlc_ampdu.h') diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h new file mode 100644 index 0000000..775faf6 --- /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 uint8 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, uint32 s1, + uint32 s2); +#endif + +#endif /* _wlc_ampdu_h_ */ -- cgit v1.1 From 7cc4a4c02954afcd00abe5af81a4254d33a36e14 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Tue, 14 Sep 2010 09:45:30 -0400 Subject: staging: brcm80211: fix 'ERROR: "foo * bar" should be "foo *bar"' Signed-off-by: Jason Cooper Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/sys/wlc_ampdu.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'drivers/staging/brcm80211/sys/wlc_ampdu.h') diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h index 775faf6..9b6dd91 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.h +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.h @@ -17,23 +17,23 @@ #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, +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 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 uint8 wlc_ampdu_null_delim_cnt(ampdu_info_t * ampdu, struct scb *scb, +extern uint8 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); +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, uint32 s1, +extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, uint32 s1, uint32 s2); #endif -- cgit v1.1 From 41feb5ede1994e2c851f65dec82790544ed364fd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 5 Oct 2010 10:09:00 -0700 Subject: Staging: brcm80211: sys: s/uint8/u8/ Replace uint8 with u8, the correct kernel type to be using here. Cc: Brett Rudley Cc: Henry Ptasinski Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/sys/wlc_ampdu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/staging/brcm80211/sys/wlc_ampdu.h') diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h index 9b6dd91..9965e27 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.h +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.h @@ -29,7 +29,7 @@ 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 uint8 wlc_ampdu_null_delim_cnt(ampdu_info_t *ampdu, struct scb *scb, +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 -- cgit v1.1 From 66cbd3ab35d35580ddf98304c280a6231685aa41 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 8 Oct 2010 11:05:47 -0700 Subject: Staging: brcm80211: s/uint32/u32/ Use the kernel types, don't invent your own. Cc: Brett Rudley Cc: Henry Ptasinski Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/sys/wlc_ampdu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging/brcm80211/sys/wlc_ampdu.h') diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.h b/drivers/staging/brcm80211/sys/wlc_ampdu.h index 9965e27..c721b16 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.h +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.h @@ -33,8 +33,8 @@ 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, uint32 s1, - uint32 s2); +extern void wlc_ampdu_txstatus_complete(ampdu_info_t *ampdu, u32 s1, + u32 s2); #endif #endif /* _wlc_ampdu_h_ */ -- cgit v1.1