Skip to content

Commit

Permalink
staging: brcm80211: cleanup struct wlc_info definition
Browse files Browse the repository at this point in the history 
The structure definition for wlc_info contained a lot of fields that
are only initialized or not used at all. These have been removed to
cleanup the driver code.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent e63ee4d commit 5dc1687
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 213 deletions.
11 changes: 0 additions & 11 deletions drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ struct wlc_info *wlc_attach_malloc(uint unit, uint *err, uint devid)
goto fail;
}

wlc->hwrxoff = WL_HWRXOFF;

/* allocate struct wlc_pub state structure */
wlc->pub = wlc_pub_malloc(unit, err, devid);
if (wlc->pub == NULL) {
Expand Down Expand Up @@ -206,14 +204,6 @@ struct wlc_info *wlc_attach_malloc(uint unit, uint *err, uint devid)
}
wlc_bsscfg_ID_assign(wlc, wlc->cfg);

wlc->pkt_callback = kzalloc(sizeof(struct pkt_cb) *
(wlc->pub->tunables->maxpktcb + 1),
GFP_ATOMIC);
if (wlc->pkt_callback == NULL) {
*err = 1013;
goto fail;
}

wlc->wsec_def_keys[0] =
kzalloc(sizeof(wsec_key_t) * WLC_DEFAULT_KEYS, GFP_ATOMIC);
if (wlc->wsec_def_keys[0] == NULL) {
Expand Down Expand Up @@ -284,7 +274,6 @@ void wlc_detach_mfree(struct wlc_info *wlc)
wlc_pub_mfree(wlc->pub);
kfree(wlc->modulecb);
kfree(wlc->default_bss);
kfree(wlc->pkt_callback);
kfree(wlc->wsec_def_keys[0]);
kfree(wlc->protection);
kfree(wlc->stf);
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,10 +499,6 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi,

wlc_ampdu_agg(ampdu, scb, p, tid);

if (wlc->block_datafifo) {
wiphy_err(wiphy, "%s: Fifo blocked\n", __func__);
return -EBUSY;
}
rr_retry_limit = ampdu->rr_retry_limit_tid[tid];
ampdu_len = 0;
dma_len = 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)

/* BCN template is available */
/* ZZZ: Use AP_ACTIVE ? */
if (AP_ENAB(wlc->pub) && (!APSTA_ENAB(wlc->pub) || wlc->aps_associated)
if (AP_ENAB(wlc->pub) && (!APSTA_ENAB(wlc->pub))
&& (macintstatus & MI_BCNTPL)) {
wlc_update_beacon(wlc);
}
Expand Down
121 changes: 10 additions & 111 deletions drivers/staging/brcm80211/brcmsmac/wlc_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,12 @@ bool wlc_ps_allowed(struct wlc_info *wlc)
struct wlc_bsscfg *cfg;

/* disallow PS when one of the following global conditions meets */
if (!wlc->pub->associated || !wlc->PMenabled || wlc->PM_override)
if (!wlc->pub->associated)
return false;

/* disallow PS when one of these meets when not scanning */
if (!wlc->PMblocked) {
if (AP_ACTIVE(wlc) || wlc->monitor)
return false;
}
if (AP_ACTIVE(wlc) || wlc->monitor)
return false;

FOREACH_AS_STA(wlc, idx, cfg) {
/* disallow PS when one of the following bsscfg specific conditions meets */
Expand All @@ -319,8 +317,6 @@ void wlc_reset(struct wlc_info *wlc)
{
BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);

wlc->check_for_unaligned_tbtt = false;

/* slurp up hw mac counters before core reset */
wlc_statsupd(wlc);

Expand All @@ -329,8 +325,6 @@ void wlc_reset(struct wlc_info *wlc)
sizeof(macstat_t));

wlc_bmac_reset(wlc->hw);
wlc->txretried = 0;

}

void wlc_fatal_error(struct wlc_info *wlc)
Expand Down Expand Up @@ -386,15 +380,8 @@ void wlc_init(struct wlc_info *wlc)

wlc_bmac_init(wlc->hw, chanspec, mute);

wlc->seckeys = wlc_bmac_read_shm(wlc->hw, M_SECRXKEYS_PTR) * 2;
if (wlc->machwcap & MCAP_TKIPMIC)
wlc->tkmickeys =
wlc_bmac_read_shm(wlc->hw, M_TKMICKEYS_PTR) * 2;

/* update beacon listen interval */
wlc_bcn_li_upd(wlc);
wlc->bcn_wait_prd =
(u8) (wlc_bmac_read_shm(wlc->hw, M_NOSLPZNATDTIM) >> 10);

/* the world is new again, so is our reported rate */
wlc_reprate_init(wlc);
Expand Down Expand Up @@ -521,7 +508,7 @@ void wlc_mac_promisc(struct wlc_info *wlc)
* Note: APs get all BSS traffic without the need to set the MCTL_PROMISC bit
* since all BSS data traffic is directed at the AP
*/
if (PROMISC_ENAB(wlc->pub) && !AP_ENAB(wlc->pub) && !wlc->wet)
if (PROMISC_ENAB(wlc->pub) && !AP_ENAB(wlc->pub))
promisc_bits |= MCTL_PROMISC;

/* monitor mode needs both MCTL_PROMISC and MCTL_KEEPCONTROL
Expand Down Expand Up @@ -987,7 +974,6 @@ static void WLBANDINITFN(wlc_setband) (struct wlc_info *wlc, uint bandunit)
return;

/* wait for at least one beacon before entering sleeping state */
wlc->PMawakebcn = true;
FOREACH_AS_STA(wlc, idx, cfg)
cfg->PMawakebcn = true;
wlc_set_ps_ctrl(wlc);
Expand Down Expand Up @@ -1035,8 +1021,6 @@ void wlc_wme_setparams(struct wlc_info *wlc, u16 aci,
return;
}

wlc->wme_admctl = 0;

do {
memset((char *)&acp_shm, 0, sizeof(shm_acparams_t));
/* fill in shm ac params struct */
Expand Down Expand Up @@ -1108,10 +1092,6 @@ void wlc_edcf_setparams(struct wlc_info *wlc, bool suspend)
for (i_ac = 0; i_ac < AC_COUNT; i_ac++, edcf_acp++) {
/* find out which ac this set of params applies to */
aci = (edcf_acp->ACI & EDCF_ACI_MASK) >> EDCF_ACI_SHIFT;
/* set the admission control policy for this AC */
if (edcf_acp->ACI & EDCF_ACM_MASK) {
wlc->wme_admctl |= 1 << aci;
}

/* fill in shm ac params struct */
params->txop = edcf_acp->TXOP;
Expand Down Expand Up @@ -1172,25 +1152,13 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
/* Assume the device is there until proven otherwise */
wlc->device_present = true;

/* set default power output percentage to 100 percent */
wlc->txpwr_percent = 100;

/* Save our copy of the chanspec */
wlc->chanspec = CH20MHZ_CHSPEC(1);

/* initialize CCK preamble mode to unassociated state */
wlc->shortpreamble = false;

wlc->legacy_probe = true;

/* various 802.11g modes */
wlc->shortslot = false;
wlc->shortslot_override = WLC_SHORTSLOT_AUTO;

wlc->barker_overlap_control = true;
wlc->barker_preamble = WLC_BARKER_SHORT_ALLOWED;
wlc->txburst_limit_override = AUTO;

wlc_protection_upd(wlc, WLC_PROT_G_OVR, WLC_PROTECTION_AUTO);
wlc_protection_upd(wlc, WLC_PROT_G_SPEC, false);

Expand Down Expand Up @@ -1223,30 +1191,6 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
wlc->SRL = RETRY_SHORT_DEF;
wlc->LRL = RETRY_LONG_DEF;

/* init PM state */
wlc->PM = PM_OFF; /* User's setting of PM mode through IOCTL */
wlc->PM_override = false; /* Prevents from going to PM if our AP is 'ill' */
wlc->PMenabled = false; /* Current PM state */
wlc->PMpending = false; /* Tracks whether STA indicated PM in the last attempt */
wlc->PMblocked = false; /* To allow blocking going into PM during RM and scans */

/* In WMM Auto mode, PM is allowed if association is a UAPSD association */
wlc->WME_PM_blocked = false;

/* Init wme queuing method */
wlc->wme_prec_queuing = false;

/* Overrides for the core to stay awake under zillion conditions Look for STAY_AWAKE */
wlc->wake = false;
/* Are we waiting for a response to PS-Poll that we sent */
wlc->PSpoll = false;

/* APSD defaults */
wlc->wme_apsd = true;
wlc->apsd_sta_usp = false;
wlc->apsd_trigger_timeout = 0; /* disable the trigger timer */
wlc->apsd_trigger_ac = AC_BITMAP_ALL;

/* Set flag to indicate that hw keys should be used when available. */
wlc->wsec_swkeys = false;

Expand All @@ -1256,8 +1200,6 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
wlc->wsec_keys[i]->idx = (u8) i;
}

wlc->_regulatory_domain = false; /* 802.11d */

/* WME QoS mode is Auto by default */
wlc->pub->_wme = AUTO;

Expand All @@ -1267,14 +1209,10 @@ void wlc_info_init(struct wlc_info *wlc, int unit)

wlc->pub->_ampdu = AMPDU_AGG_HOST;
wlc->pub->bcmerror = 0;
wlc->ibss_allowed = true;
wlc->ibss_coalesce_allowed = true;
wlc->pub->_coex = ON;

/* initialize mpc delay */
wlc->mpc_delay_off = wlc->mpc_dlycnt = WLC_MPC_MIN_DELAYCNT;

wlc->pr80838_war = true;
}

static bool wlc_state_bmac_sync(struct wlc_info *wlc)
Expand Down Expand Up @@ -1358,11 +1296,8 @@ void *wlc_attach(struct wl_info *wl, u16 vendor, u16 device, uint unit,
wlc->core = wlc->corestate;
wlc->wl = wl;
pub->unit = unit;
wlc->btparam = btparam;
pub->_piomode = piomode;
wlc->bandinit_pending = false;
/* By default restrict TKIP associations from 11n STA's */
wlc->ht_wsec_restriction = WLC_HT_TKIP_RESTRICT;

/* populate struct wlc_info with default values */
wlc_info_init(wlc, unit);
Expand Down Expand Up @@ -1527,9 +1462,6 @@ void *wlc_attach(struct wl_info *wl, u16 vendor, u16 device, uint unit,
wlc->cck_40txbw = AUTO;
wlc_update_mimo_band_bwcap(wlc, WLC_N_BW_20IN2G_40IN5G);

/* Enable setting the RIFS Mode bit by default in HT Info IE */
wlc->rifs_advert = AUTO;

/* Set default values of SGI */
if (WLC_SGI_CAP_PHY(wlc)) {
wlc_ht_update_sgi_rx(wlc, (WLC_N_SGI_20 | WLC_N_SGI_40));
Expand Down Expand Up @@ -1722,25 +1654,6 @@ uint wlc_detach(struct wlc_info *wlc)

wlc_detach_module(wlc);

/* free other state */


#ifdef BCMDBG
kfree(wlc->country_ie_override);
wlc->country_ie_override = NULL;
#endif /* BCMDBG */

{
/* free dumpcb list */
struct dumpcb_s *prev, *ptr;
prev = ptr = wlc->dumpcb_head;
while (ptr) {
ptr = prev->next;
kfree(prev);
prev = ptr;
}
wlc->dumpcb_head = NULL;
}

while (wlc->tx_queues != NULL)
wlc_txq_free(wlc, wlc->tx_queues);
Expand All @@ -1757,9 +1670,6 @@ void wlc_ap_upd(struct wlc_info *wlc)
else
wlc->PLCPHdr_override = WLC_PLCP_SHORT; /* STA-BSS; short capable */

/* disable vlan_mode on AP since some legacy STAs cannot rx tagged pkts */
wlc->vlan_mode = AP_ENAB(wlc->pub) ? OFF : AUTO;

/* fixup mpc */
wlc->mpc = true;
}
Expand Down Expand Up @@ -1892,9 +1802,7 @@ static void wlc_radio_enable(struct wlc_info *wlc)
if (DEVICEREMOVED(wlc))
return;

if (!wlc->down_override) { /* imposed by wl down/out ioctl */
wl_up(wlc->wl);
}
wl_up(wlc->wl);
}

/* periodical query hw radio button while driver is "down" */
Expand Down Expand Up @@ -2230,7 +2138,6 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
s8 shortslot = WLC_SHORTSLOT_AUTO; /* Advertise and use shortslot (-1/0/1 Auto/Off/On) */
bool shortslot_restrict = false; /* Restrict association to stations that support shortslot
*/
bool ignore_bcns = true; /* Ignore legacy beacons on the same channel */
bool ofdm_basic = false; /* Make 6, 12, and 24 basic rates */
int preamble = WLC_PLCP_LONG; /* Advertise and use short preambles (-1/0/1 Auto/Off/On) */
bool preamble_restrict = false; /* Restrict association to stations that support short
Expand Down Expand Up @@ -2326,8 +2233,6 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)

band->gmode = gmode;

wlc->ignore_bcns = ignore_bcns;

wlc->shortslot_override = shortslot;

if (AP_ENAB(wlc->pub)) {
Expand Down Expand Up @@ -4418,7 +4323,6 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
if (lastframe) {
p->next = NULL;
p->prev = NULL;
wlc->txretried = 0;
/* remove PLCP & Broadcom tx descriptor header */
skb_pull(p, D11_PHY_HDR_LEN);
skb_pull(p, D11_TXH_LEN);
Expand Down Expand Up @@ -4448,15 +4352,9 @@ wlc_txfifo_complete(struct wlc_info *wlc, uint fifo, s8 txpktpend)
/* There is more room; mark precedences related to this FIFO sendable */
WLC_TX_FIFO_ENAB(wlc, fifo);

if (!TXPKTPENDTOT(wlc)) {
if (wlc->block_datafifo & DATA_BLOCK_TX_SUPR)
wlc_bsscfg_tx_check(wlc);
}

/* Clear MHF2_TXBCMC_NOW flag if BCMC fifo has drained */
if (AP_ENAB(wlc->pub) &&
wlc->bcmcfifo_drain && !TXPKTPENDGET(wlc, TX_BCMC_FIFO)) {
wlc->bcmcfifo_drain = false;
!TXPKTPENDGET(wlc, TX_BCMC_FIFO)) {
wlc_mhf(wlc, MHF2, MHF2_TXBCMC_NOW, 0, WLC_BAND_AUTO);
}

Expand Down Expand Up @@ -4662,7 +4560,7 @@ void wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
rxh = (d11rxhdr_t *) (p->data);

/* strip off rxhdr */
skb_pull(p, wlc->hwrxoff);
skb_pull(p, WL_HWRXOFF);

/* fixup rx header endianness */
rxh->RxFrameSize = le16_to_cpu(rxh->RxFrameSize);
Expand Down Expand Up @@ -5174,8 +5072,6 @@ static void wlc_update_mimo_band_bwcap(struct wlc_info *wlc, u8 bwcap)
band->mimo_cap_40 = false;
}
}

wlc->mimo_band_bwcap = bwcap;
}

void wlc_mod_prb_rsp_rate_table(struct wlc_info *wlc, uint frame_len)
Expand Down Expand Up @@ -5848,12 +5744,15 @@ static void
wlc_txflowcontrol_signal(struct wlc_info *wlc, struct wlc_txq_info *qi, bool on,
int prio)
{
#ifdef NON_FUNCTIONAL
/* wlcif_list is never filled so this function is not functional */
struct wlc_if *wlcif;

for (wlcif = wlc->wlcif_list; wlcif != NULL; wlcif = wlcif->next) {
if (wlcif->qi == qi && wlcif->flags & WLC_IF_LINKED)
wl_txflowcontrol(wlc->wl, wlcif->wlif, on, prio);
}
#endif
}

static struct wlc_txq_info *wlc_txq_alloc(struct wlc_info *wlc)
Expand Down
Loading

0 comments on commit 5dc1687

Please sign in to comment.