Commit 471f1b51 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: renamed structures in softmac 



Several structures contained a '_c_' in their name that does not add any
information.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 27ef0efb

drivers/staging/brcm80211/brcmsmac/alloc.c

+18 −18
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include "main.h"

#include "alloc.h"



static struct brcms_c_bsscfg *brcms_c_bsscfg_malloc(uint unit);

static void brcms_c_bsscfg_mfree(struct brcms_c_bsscfg *cfg);

static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit);

static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg);

static struct brcms_pub *brcms_c_pub_malloc(uint unit,

				      uint *err, uint devid);

static void brcms_c_pub_mfree(struct brcms_pub *pub);
@@ -87,11 +87,11 @@ static void brcms_c_pub_mfree(struct brcms_pub *pub) 
	kfree(pub);

}



static struct brcms_c_bsscfg *brcms_c_bsscfg_malloc(uint unit)

static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit)

{

	struct brcms_c_bsscfg *cfg;

	struct brcms_bss_cfg *cfg;



	cfg = kzalloc(sizeof(struct brcms_c_bsscfg), GFP_ATOMIC);

	cfg = kzalloc(sizeof(struct brcms_bss_cfg), GFP_ATOMIC);

	if (cfg == NULL)

		goto fail;
@@ -106,7 +106,7 @@ static struct brcms_c_bsscfg *brcms_c_bsscfg_malloc(uint unit) 
	return NULL;

}



static void brcms_c_bsscfg_mfree(struct brcms_c_bsscfg *cfg)

static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg)

{

	if (cfg == NULL)

		return;
@@ -117,7 +117,7 @@ static void brcms_c_bsscfg_mfree(struct brcms_c_bsscfg *cfg) 
}



static void brcms_c_bsscfg_ID_assign(struct brcms_c_info *wlc,

				 struct brcms_c_bsscfg *bsscfg)

				 struct brcms_bss_cfg *bsscfg)

{

	bsscfg->ID = wlc->next_bsscfg_ID;

	wlc->next_bsscfg_ID++;
@@ -144,9 +144,9 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
	}

	wlc->pub->wlc = wlc;



	/* allocate struct brcms_c_hw_info state structure */

	/* allocate struct brcms_hardware state structure */



	wlc->hw = kzalloc(sizeof(struct brcms_c_hw_info), GFP_ATOMIC);

	wlc->hw = kzalloc(sizeof(struct brcms_hardware), GFP_ATOMIC);

	if (wlc->hw == NULL) {

		*err = 1005;

		goto fail;
@@ -154,7 +154,7 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
	wlc->hw->wlc = wlc;



	wlc->hw->bandstate[0] =

		kzalloc(sizeof(struct brcms_c_hwband) * MAXBANDS, GFP_ATOMIC);

		kzalloc(sizeof(struct brcms_hw_band) * MAXBANDS, GFP_ATOMIC);

	if (wlc->hw->bandstate[0] == NULL) {

		*err = 1006;

		goto fail;
@@ -162,9 +162,9 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
		int i;



		for (i = 1; i < MAXBANDS; i++) {

			wlc->hw->bandstate[i] = (struct brcms_c_hwband *)

			wlc->hw->bandstate[i] = (struct brcms_hw_band *)

			    ((unsigned long)wlc->hw->bandstate[0] +

			     (sizeof(struct brcms_c_hwband) * i));

			     (sizeof(struct brcms_hw_band) * i));

		}

	}
@@ -202,21 +202,21 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
		}

	}



	wlc->protection = kzalloc(sizeof(struct brcms_c_protection),

	wlc->protection = kzalloc(sizeof(struct brcms_protection),

				  GFP_ATOMIC);

	if (wlc->protection == NULL) {

		*err = 1016;

		goto fail;

	}



	wlc->stf = kzalloc(sizeof(struct brcms_c_stf), GFP_ATOMIC);

	wlc->stf = kzalloc(sizeof(struct brcms_stf), GFP_ATOMIC);

	if (wlc->stf == NULL) {

		*err = 1017;

		goto fail;

	}



	wlc->bandstate[0] =

		kzalloc(sizeof(struct brcms_c_band)*MAXBANDS, GFP_ATOMIC);

		kzalloc(sizeof(struct brcms_band)*MAXBANDS, GFP_ATOMIC);

	if (wlc->bandstate[0] == NULL) {

		*err = 1025;

		goto fail;
@@ -224,13 +224,13 @@ struct brcms_c_info *brcms_c_attach_malloc(uint unit, uint *err, uint devid) 
		int i;



		for (i = 1; i < MAXBANDS; i++) {

			wlc->bandstate[i] = (struct brcms_c_band *)

			wlc->bandstate[i] = (struct brcms_band *)

				((unsigned long)wlc->bandstate[0]

				+ (sizeof(struct brcms_c_band)*i));

				+ (sizeof(struct brcms_band)*i));

		}

	}



	wlc->corestate = kzalloc(sizeof(struct brcms_c_core), GFP_ATOMIC);

	wlc->corestate = kzalloc(sizeof(struct brcms_core), GFP_ATOMIC);

	if (wlc->corestate == NULL) {

		*err = 1026;

		goto fail;

drivers/staging/brcm80211/brcmsmac/ampdu.c

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ brcms_c_ampdu_tx_operational(struct brcms_c_info *wlc, u8 tid, 
}



int

brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_c_txq_info *qi,

brcms_c_sendampdu(struct ampdu_info *ampdu, struct brcms_txq_info *qi,

	      struct sk_buff **pdu, int prec)

{

	struct brcms_c_info *wlc;
@@ -1204,7 +1204,7 @@ static void dma_cb_fn_ampdu(void *txi, void *arg_a) 
void brcms_c_ampdu_flush(struct brcms_c_info *wlc,

		     struct ieee80211_sta *sta, u16 tid)

{

	struct brcms_c_txq_info *qi = wlc->pkt_queue;

	struct brcms_txq_info *qi = wlc->pkt_queue;

	struct pktq *pq = &qi->q;

	int prec;

	struct cb_del_ampdu_pars ampdu_pars;

drivers/staging/brcm80211/brcmsmac/ampdu.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
extern struct ampdu_info *brcms_c_ampdu_attach(struct brcms_c_info *wlc);

extern void brcms_c_ampdu_detach(struct ampdu_info *ampdu);

extern int brcms_c_sendampdu(struct ampdu_info *ampdu,

			     struct brcms_c_txq_info *qi,

			     struct brcms_txq_info *qi,

			     struct sk_buff **aggp, int prec);

extern void brcms_c_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,

				 struct sk_buff *p, struct tx_status *txs);

drivers/staging/brcm80211/brcmsmac/bmac.c

+145 −145

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/brcm80211/brcmsmac/bmac.h

+48 −48
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <brcmu_wifi.h>

#include "types.h"



/* dup state between BMAC(struct brcms_c_hw_info) and HIGH(struct brcms_c_info)

/* dup state between BMAC(struct brcms_hardware) and HIGH(struct brcms_c_info)

   driver */

struct brcms_b_state {

	u32 machwcap;	/* mac hw capibility */
@@ -78,97 +78,97 @@ extern int brcms_b_detach(struct brcms_c_info *wlc); 
extern void brcms_b_watchdog(void *arg);



/* up/down, reset, clk */

extern void brcms_b_copyto_objmem(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_copyto_objmem(struct brcms_hardware *wlc_hw,

				   uint offset, const void *buf, int len,

				   u32 sel);

extern void brcms_b_copyfrom_objmem(struct brcms_c_hw_info *wlc_hw, uint offset,

extern void brcms_b_copyfrom_objmem(struct brcms_hardware *wlc_hw, uint offset,

				     void *buf, int len, u32 sel);

#define brcms_b_copyfrom_shm(wlc_hw, offset, buf, len)                 \

	brcms_b_copyfrom_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)

#define brcms_b_copyto_shm(wlc_hw, offset, buf, len)                   \

	brcms_b_copyto_objmem(wlc_hw, offset, buf, len, OBJADDR_SHM_SEL)



extern void brcms_b_core_phypll_reset(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_core_phypll_ctl(struct brcms_c_hw_info *wlc_hw, bool on);

extern void brcms_b_phyclk_fgc(struct brcms_c_hw_info *wlc_hw, bool clk);

extern void brcms_b_macphyclk_set(struct brcms_c_hw_info *wlc_hw, bool clk);

extern void brcms_b_phy_reset(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_corereset(struct brcms_c_hw_info *wlc_hw, u32 flags);

extern void brcms_b_reset(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_init(struct brcms_c_hw_info *wlc_hw, chanspec_t chanspec,

extern void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw);

extern void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on);

extern void brcms_b_phyclk_fgc(struct brcms_hardware *wlc_hw, bool clk);

extern void brcms_b_macphyclk_set(struct brcms_hardware *wlc_hw, bool clk);

extern void brcms_b_phy_reset(struct brcms_hardware *wlc_hw);

extern void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags);

extern void brcms_b_reset(struct brcms_hardware *wlc_hw);

extern void brcms_b_init(struct brcms_hardware *wlc_hw, chanspec_t chanspec,

			  bool mute);

extern int brcms_b_up_prep(struct brcms_c_hw_info *wlc_hw);

extern int brcms_b_up_finish(struct brcms_c_hw_info *wlc_hw);

extern int brcms_b_bmac_down_prep(struct brcms_c_hw_info *wlc_hw);

extern int brcms_b_down_finish(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_switch_macfreq(struct brcms_c_hw_info *wlc_hw, u8 spurmode);

extern int brcms_b_up_prep(struct brcms_hardware *wlc_hw);

extern int brcms_b_up_finish(struct brcms_hardware *wlc_hw);

extern int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw);

extern int brcms_b_down_finish(struct brcms_hardware *wlc_hw);

extern void brcms_b_switch_macfreq(struct brcms_hardware *wlc_hw, u8 spurmode);



/* chanspec, ucode interface */

extern void brcms_b_set_chanspec(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_set_chanspec(struct brcms_hardware *wlc_hw,

				  chanspec_t chanspec,

				  bool mute, struct txpwr_limits *txpwr);



extern int brcms_b_xmtfifo_sz_get(struct brcms_c_hw_info *wlc_hw, uint fifo,

extern int brcms_b_xmtfifo_sz_get(struct brcms_hardware *wlc_hw, uint fifo,

				   uint *blocks);

extern void brcms_b_mhf(struct brcms_c_hw_info *wlc_hw, u8 idx, u16 mask,

extern void brcms_b_mhf(struct brcms_hardware *wlc_hw, u8 idx, u16 mask,

			 u16 val, int bands);

extern void brcms_b_mctrl(struct brcms_c_hw_info *wlc_hw, u32 mask, u32 val);

extern u16 brcms_b_mhf_get(struct brcms_c_hw_info *wlc_hw, u8 idx, int bands);

extern void brcms_b_txant_set(struct brcms_c_hw_info *wlc_hw, u16 phytxant);

extern u16 brcms_b_get_txant(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_antsel_type_set(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_mctrl(struct brcms_hardware *wlc_hw, u32 mask, u32 val);

extern u16 brcms_b_mhf_get(struct brcms_hardware *wlc_hw, u8 idx, int bands);

extern void brcms_b_txant_set(struct brcms_hardware *wlc_hw, u16 phytxant);

extern u16 brcms_b_get_txant(struct brcms_hardware *wlc_hw);

extern void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw,

				     u8 antsel_type);

extern int brcms_b_state_get(struct brcms_c_hw_info *wlc_hw,

extern int brcms_b_state_get(struct brcms_hardware *wlc_hw,

			      struct brcms_b_state *state);

extern void brcms_b_write_shm(struct brcms_c_hw_info *wlc_hw, uint offset,

extern void brcms_b_write_shm(struct brcms_hardware *wlc_hw, uint offset,

			      u16 v);

extern u16 brcms_b_read_shm(struct brcms_c_hw_info *wlc_hw, uint offset);

extern void brcms_b_write_template_ram(struct brcms_c_hw_info *wlc_hw,

extern u16 brcms_b_read_shm(struct brcms_hardware *wlc_hw, uint offset);

extern void brcms_b_write_template_ram(struct brcms_hardware *wlc_hw,

				       int offset, int len, void *buf);

extern void brcms_b_copyfrom_vars(struct brcms_c_hw_info *wlc_hw, char **buf,

extern void brcms_b_copyfrom_vars(struct brcms_hardware *wlc_hw, char **buf,

				   uint *len);



extern void brcms_b_hw_etheraddr(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_hw_etheraddr(struct brcms_hardware *wlc_hw,

				  u8 *ea);



extern bool brcms_b_radio_read_hwdisabled(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_set_shortslot(struct brcms_c_hw_info *wlc_hw,

extern bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw);

extern void brcms_b_set_shortslot(struct brcms_hardware *wlc_hw,

				  bool shortslot);

extern void brcms_b_band_stf_ss_set(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_band_stf_ss_set(struct brcms_hardware *wlc_hw,

				    u8 stf_mode);



extern void brcms_b_wait_for_wake(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_wait_for_wake(struct brcms_hardware *wlc_hw);



extern void brcms_c_ucode_wake_override_set(struct brcms_c_hw_info *wlc_hw,

extern void brcms_c_ucode_wake_override_set(struct brcms_hardware *wlc_hw,

					u32 override_bit);

extern void brcms_c_ucode_wake_override_clear(struct brcms_c_hw_info *wlc_hw,

extern void brcms_c_ucode_wake_override_clear(struct brcms_hardware *wlc_hw,

					  u32 override_bit);



extern void brcms_b_set_addrmatch(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_set_addrmatch(struct brcms_hardware *wlc_hw,

				   int match_reg_offset,

				   const u8 *addr);

extern void brcms_b_write_hw_bcntemplates(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_write_hw_bcntemplates(struct brcms_hardware *wlc_hw,

					   void *bcn, int len, bool both);



extern void brcms_b_read_tsf(struct brcms_c_hw_info *wlc_hw, u32 *tsf_l_ptr,

extern void brcms_b_read_tsf(struct brcms_hardware *wlc_hw, u32 *tsf_l_ptr,

			      u32 *tsf_h_ptr);

extern void brcms_b_set_cwmin(struct brcms_c_hw_info *wlc_hw, u16 newmin);

extern void brcms_b_set_cwmax(struct brcms_c_hw_info *wlc_hw, u16 newmax);

extern void brcms_b_set_cwmin(struct brcms_hardware *wlc_hw, u16 newmin);

extern void brcms_b_set_cwmax(struct brcms_hardware *wlc_hw, u16 newmax);



extern void brcms_b_retrylimit_upd(struct brcms_c_hw_info *wlc_hw, u16 SRL,

extern void brcms_b_retrylimit_upd(struct brcms_hardware *wlc_hw, u16 SRL,

				    u16 LRL);



extern void brcms_b_fifoerrors(struct brcms_c_hw_info *wlc_hw);

extern void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw);





/* API for BMAC driver (e.g. wlc_phy.c etc) */



extern void brcms_b_bw_set(struct brcms_c_hw_info *wlc_hw, u16 bw);

extern void brcms_b_pllreq(struct brcms_c_hw_info *wlc_hw, bool set,

extern void brcms_b_bw_set(struct brcms_hardware *wlc_hw, u16 bw);

extern void brcms_b_pllreq(struct brcms_hardware *wlc_hw, bool set,

			    mbool req_bit);

extern void brcms_b_hw_up(struct brcms_c_hw_info *wlc_hw);

extern u16 brcms_b_rate_shm_offset(struct brcms_c_hw_info *wlc_hw, u8 rate);

extern void brcms_b_antsel_set(struct brcms_c_hw_info *wlc_hw,

extern void brcms_b_hw_up(struct brcms_hardware *wlc_hw);

extern u16 brcms_b_rate_shm_offset(struct brcms_hardware *wlc_hw, u8 rate);

extern void brcms_b_antsel_set(struct brcms_hardware *wlc_hw,

			       u32 antsel_avail);



#endif /* _BRCM_BOTTOM_MAC_H_ */