Skip to content

Commit

Permalink
staging: brcm80211: replaced typedef wlc_rateset_t
Browse files Browse the repository at this point in the history 
By struct brcms_c_rateset. Struct brcms_c_rateset was renamed from
brcms_rateset, because there will be two rateset related structures that
should differ significantly in naming from each other. Struct wl_rateset
will be renamed to struct brcm_rateset in the next patch.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 6bd20a1 commit fa67ebb
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 81 deletions.
55 changes: 30 additions & 25 deletions drivers/staging/brcm80211/brcmsmac/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,8 @@ static void brcms_c_tx_prec_map_init(struct brcms_c_info *wlc);
static void brcms_c_watchdog(void *arg);
static void brcms_c_watchdog_by_timer(void *arg);
static u16 brcms_c_rate_shm_offset(struct brcms_c_info *wlc, u8 rate);
static int brcms_c_set_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs_arg);
static int brcms_c_set_rateset(struct brcms_c_info *wlc,
struct brcms_c_rateset *rs_arg);
static u8 brcms_c_local_constraint_qdbm(struct brcms_c_info *wlc);

/* send and receive */
Expand Down Expand Up @@ -3720,7 +3721,7 @@ void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)
}

u32 brcms_c_lowest_basic_rspec(struct brcms_c_info *wlc,
wlc_rateset_t *rs)
struct brcms_c_rateset *rs)
{
u32 lowest_basic_rspec;
uint i;
Expand Down Expand Up @@ -3876,7 +3877,7 @@ static void brcms_c_ucode_mac_upd(struct brcms_c_info *wlc)
static void brcms_c_bandinit_ordered(struct brcms_c_info *wlc,
u16 chanspec)
{
wlc_rateset_t default_rateset;
struct brcms_c_rateset default_rateset;
uint parkband;
uint i, band_order[2];

Expand Down Expand Up @@ -5711,7 +5712,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
{
int ret = 0;
uint i;
wlc_rateset_t rs;
struct brcms_c_rateset rs;
/* Default to 54g Auto */
/* Advertise and use shortslot (-1/0/1 Auto/Off/On) */
s8 shortslot = BRCMS_SHORTSLOT_AUTO;
Expand Down Expand Up @@ -5750,10 +5751,10 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
brcms_c_protection_upd(wlc, BRCMS_PROT_G_USER, gmode);

/* Clear supported rates filter */
memset(&wlc->sup_rates_override, 0, sizeof(wlc_rateset_t));
memset(&wlc->sup_rates_override, 0, sizeof(struct brcms_c_rateset));

/* Clear rateset override */
memset(&rs, 0, sizeof(wlc_rateset_t));
memset(&rs, 0, sizeof(struct brcms_c_rateset));

switch (gmode) {
case GMODE_LEGACY_B:
Expand Down Expand Up @@ -5938,20 +5939,21 @@ int brcms_c_set_nmode(struct brcms_c_info *wlc, s32 nmode)
return err;
}

static int brcms_c_set_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs_arg)
static int
brcms_c_set_rateset(struct brcms_c_info *wlc, struct brcms_c_rateset *rs_arg)
{
wlc_rateset_t rs, new;
struct brcms_c_rateset rs, new;
uint bandunit;

memcpy(&rs, rs_arg, sizeof(wlc_rateset_t));
memcpy(&rs, rs_arg, sizeof(struct brcms_c_rateset));

/* check for bad count value */
if ((rs.count == 0) || (rs.count > BRCMS_NUMRATES))
return -EINVAL;

/* try the current band */
bandunit = wlc->band->bandunit;
memcpy(&new, &rs, sizeof(wlc_rateset_t));
memcpy(&new, &rs, sizeof(struct brcms_c_rateset));
if (brcms_c_rate_hwrs_filter_sort_validate
(&new, &wlc->bandstate[bandunit]->hw_rateset, true,
wlc->stf->txstreams))
Expand All @@ -5960,7 +5962,7 @@ static int brcms_c_set_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs_arg)
/* try the other band */
if (IS_MBAND_UNLOCKED(wlc)) {
bandunit = OTHERBANDUNIT(wlc);
memcpy(&new, &rs, sizeof(wlc_rateset_t));
memcpy(&new, &rs, sizeof(struct brcms_c_rateset));
if (brcms_c_rate_hwrs_filter_sort_validate(&new,
&wlc->
bandstate[bandunit]->
Expand All @@ -5973,9 +5975,10 @@ static int brcms_c_set_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs_arg)

good:
/* apply new rateset */
memcpy(&wlc->default_bss->rateset, &new, sizeof(wlc_rateset_t));
memcpy(&wlc->default_bss->rateset, &new,
sizeof(struct brcms_c_rateset));
memcpy(&wlc->bandstate[bandunit]->defrateset, &new,
sizeof(wlc_rateset_t));
sizeof(struct brcms_c_rateset));
return 0;
}

Expand Down Expand Up @@ -6132,7 +6135,7 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,

case BRCM_GET_CURR_RATESET:{
wl_rateset_t *ret_rs = (wl_rateset_t *) arg;
wlc_rateset_t *rs;
struct brcms_c_rateset *rs;

if (wlc->pub->associated)
rs = &current_bss->rateset;
Expand All @@ -6151,7 +6154,7 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
}

case BRCM_SET_RATESET:{
wlc_rateset_t rs;
struct brcms_c_rateset rs;
wl_rateset_t *in_rs = (wl_rateset_t *) arg;

if (len < (int)(in_rs->count + sizeof(in_rs->count))) {
Expand All @@ -6164,7 +6167,7 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
break;
}

memset(&rs, 0, sizeof(wlc_rateset_t));
memset(&rs, 0, sizeof(struct brcms_c_rateset));

/* Copy only legacy rateset section */
rs.count = in_rs->count;
Expand Down Expand Up @@ -8486,7 +8489,8 @@ brcms_c_calc_cts_time(struct brcms_c_info *wlc, u32 rspec,
}

/* derive wlc->band->basic_rate[] table from 'rateset' */
void brcms_c_rate_lookup_init(struct brcms_c_info *wlc, wlc_rateset_t *rateset)
void brcms_c_rate_lookup_init(struct brcms_c_info *wlc,
struct brcms_c_rateset *rateset)
{
u8 rate;
u8 mandatory;
Expand Down Expand Up @@ -8610,9 +8614,10 @@ static void brcms_c_write_rate_shm(struct brcms_c_info *wlc, u8 rate,
brcms_c_write_shm(wlc, (basic_table + index * 2), basic_ptr);
}

static const wlc_rateset_t *brcms_c_rateset_get_hwrs(struct brcms_c_info *wlc)
static const struct brcms_c_rateset *
brcms_c_rateset_get_hwrs(struct brcms_c_info *wlc)
{
const wlc_rateset_t *rs_dflt;
const struct brcms_c_rateset *rs_dflt;

if (BRCMS_PHY_11N_CAP(wlc->band)) {
if (BAND_5G(wlc->band->bandtype))
Expand All @@ -8629,8 +8634,8 @@ static const wlc_rateset_t *brcms_c_rateset_get_hwrs(struct brcms_c_info *wlc)

void brcms_c_set_ratetable(struct brcms_c_info *wlc)
{
const wlc_rateset_t *rs_dflt;
wlc_rateset_t rs;
const struct brcms_c_rateset *rs_dflt;
struct brcms_c_rateset rs;
u8 rate, basic_rate;
uint i;

Expand Down Expand Up @@ -8665,7 +8670,7 @@ void brcms_c_set_ratetable(struct brcms_c_info *wlc)
bool brcms_c_valid_rate(struct brcms_c_info *wlc, u32 rspec, int band,
bool verbose)
{
wlc_rateset_t *hw_rateset;
struct brcms_c_rateset *hw_rateset;
uint i;

if ((band == BRCM_BAND_AUTO) || (band == wlc->band->bandtype)) {
Expand Down Expand Up @@ -8723,8 +8728,8 @@ static void brcms_c_update_mimo_band_bwcap(struct brcms_c_info *wlc, u8 bwcap)

void brcms_c_mod_prb_rsp_rate_table(struct brcms_c_info *wlc, uint frame_len)
{
const wlc_rateset_t *rs_dflt;
wlc_rateset_t rs;
const struct brcms_c_rateset *rs_dflt;
struct brcms_c_rateset rs;
u8 rate;
u16 entry_ptr;
u8 plcp[D11_PHY_HDR_LEN];
Expand Down Expand Up @@ -9037,7 +9042,7 @@ void brcms_c_bsscfg_reprate_init(struct brcms_bss_cfg *bsscfg)
memset((char *)bsscfg->txrspec, 0, sizeof(bsscfg->txrspec));
}

void brcms_default_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs)
void brcms_default_rateset(struct brcms_c_info *wlc, struct brcms_c_rateset *rs)
{
brcms_c_rateset_default(rs, NULL, wlc->band->phytype,
wlc->band->bandtype, false, BRCMS_RATE_MASK_FULL,
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/brcm80211/brcmsmac/main.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,15 @@ struct brcms_band {

struct scb *hwrs_scb; /* permanent scb for hw rateset */

wlc_rateset_t defrateset; /* band-specific copy of default_bss.rateset */
/* band-specific copy of default_bss.rateset */
struct brcms_c_rateset defrateset;

u32 rspec_override; /* 802.11 rate override */
u32 mrspec_override; /* multicast rate override */
u8 band_stf_ss_mode; /* Configured STF type, 0:siso; 1:cdd */
s8 band_stf_stbc_tx; /* STBC TX 0:off; 1:force on; -1:auto */
wlc_rateset_t hw_rateset; /* rates supported by chip (phy-specific) */
/* rates supported by chip (phy-specific) */
struct brcms_c_rateset hw_rateset;
u8 basic_rate[BRCM_MAXRATE + 1]; /* basic rates indexed by rate */
bool mimo_cap_40; /* 40 MHz cap enabled on this band */
s8 antgain; /* antenna gain from srom */
Expand Down Expand Up @@ -751,10 +753,8 @@ struct brcms_c_info {
u16 prb_resp_timeout; /* do not send prb resp if request older than this,
* 0 = disable
*/

wlc_rateset_t sup_rates_override; /* use only these rates in 11g supported rates if
* specifed
*/
/* use only these rates in 11g supported rates if specified */
struct brcms_c_rateset sup_rates_override;

u16 home_chanspec; /* shared home chanspec */

Expand Down Expand Up @@ -1040,7 +1040,7 @@ extern void brcms_c_beacon_phytxctl_txant_upd(struct brcms_c_info *wlc,
extern void brcms_c_mod_prb_rsp_rate_table(struct brcms_c_info *wlc,
uint frame_len);
extern u32 brcms_c_lowest_basic_rspec(struct brcms_c_info *wlc,
wlc_rateset_t *rs);
struct brcms_c_rateset *rs);
extern void brcms_c_radio_disable(struct brcms_c_info *wlc);
extern void brcms_c_bcn_li_upd(struct brcms_c_info *wlc);
extern void brcms_c_set_home_chanspec(struct brcms_c_info *wlc,
Expand Down
9 changes: 5 additions & 4 deletions drivers/staging/brcm80211/brcmsmac/pub.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ struct brcms_tunables {
int memreserved; /* memory reserved for BMAC's USB dma rx */
};

struct brcms_rateset {
struct brcms_c_rateset {
uint count; /* number of rates in rates[] */
/* rates in 500kbps units w/hi bit set if basic */
u8 rates[BRCMS_NUMRATES];
Expand Down Expand Up @@ -173,7 +173,7 @@ struct brcms_bss_info {
u16 atim_window; /* units are Kusec */
u16 chanspec; /* Channel num, bw, ctrl_sb and band */
s8 infra; /* 0=IBSS, 1=infrastructure, 2=unknown */
wlc_rateset_t rateset; /* supported rates */
struct brcms_c_rateset rateset; /* supported rates */
u8 dtim_period; /* DTIM period */
s8 phy_noise; /* noise right after tx (in dBm) */
u16 capability; /* Capability information */
Expand Down Expand Up @@ -592,8 +592,9 @@ extern struct brcms_pub *brcms_c_pub(void *wlc);
extern void brcms_c_mhf(struct brcms_c_info *wlc, u8 idx, u16 mask, u16 val,
int bands);
extern void brcms_c_rate_lookup_init(struct brcms_c_info *wlc,
wlc_rateset_t *rateset);
extern void brcms_default_rateset(struct brcms_c_info *wlc, wlc_rateset_t *rs);
struct brcms_c_rateset *rateset);
extern void brcms_default_rateset(struct brcms_c_info *wlc,
struct brcms_c_rateset *rs);

extern void brcms_c_ampdu_flush(struct brcms_c_info *wlc,
struct ieee80211_sta *sta, u16 tid);
Expand Down
Loading

0 comments on commit fa67ebb

Please sign in to comment.