Skip to content

L
linux
Commit 40592ba9 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files
Options

staging: brcm80211: removed counter related struct wl_cnt 

Code cleanup. Struct wl_cnt contains all sorts of counters, but either these
were written and never read, or set to zero at initialization but never
updated. Therefore the struct and any code accessing the struct has been
removed.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 47298e71
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 373 deletions
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
View file @ 40592ba9
......@@ -532,10 +532,10 @@ wl_ops_get_stats(struct ieee80211_hw *hw,
WL_LOCK(wl);
cnt = wl->pub->_cnt;
stats->dot11ACKFailureCount = cnt->txnoack;
stats->dot11RTSFailureCount = cnt->txnocts;
stats->dot11FCSErrorCount = cnt->rxcrc;
stats->dot11RTSSuccessCount = cnt->txrts;
stats->dot11ACKFailureCount = 0;
stats->dot11RTSFailureCount = 0;
stats->dot11FCSErrorCount = 0;
stats->dot11RTSSuccessCount = 0;
WL_UNLOCK(wl);
return 0;
}
......
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
View file @ 40592ba9
......@@ -80,10 +80,6 @@ static struct wlc_pub *wlc_pub_malloc(uint unit, uint *err, uint devid)
/* need to init the tunables now */
wlc_tunables_init(pub->tunables, devid);
pub->_cnt = kzalloc(sizeof(struct wl_cnt), GFP_ATOMIC);
if (pub->_cnt == NULL)
goto fail;
pub->multicast = kzalloc(ETH_ALEN * MAXMULTILIST, GFP_ATOMIC);
if (pub->multicast == NULL) {
*err = 1003;
......@@ -103,7 +99,6 @@ static void wlc_pub_mfree(struct wlc_pub *pub)
return;
kfree(pub->multicast);
kfree(pub->_cnt);
kfree(pub->tunables);
kfree(pub);
}
......
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
View file @ 40592ba9
......@@ -982,11 +982,7 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
if (supr_status == TX_STATUS_SUPR_BADCH ||
supr_status == TX_STATUS_SUPR_EXPTIME) {
retry = false;
wlc->pub->_cnt->txchanrej++;
} else if (supr_status == TX_STATUS_SUPR_EXPTIME) {
wlc->pub->_cnt->txexptime++;
/* TX underflow : try tuning pre-loading or ampdu size */
} else if (supr_status == TX_STATUS_SUPR_FRAG) {
/* if there were underflows, but pre-loading is not active,
......@@ -999,7 +995,6 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
}
} else if (txs->phyerr) {
update_rate = false;
wlc->pub->_cnt->txphyerr++;
wiphy_err(wiphy, "wl%d: wlc_ampdu_dotxstatus: tx phy "
"error (0x%x)\n", wlc->pub->unit,
txs->phyerr);
......
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
View file @ 40592ba9
......@@ -362,11 +362,6 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
wlc->qvalid = 0;
}
/* phy tx error */
if (macintstatus & MI_PHYTXERR) {
wlc->pub->_cnt->txphyerr++;
}
/* received data or control frame, MI_DMAINT is indication of RX_FIFO interrupt */
if (macintstatus & MI_DMAINT) {
if (wlc_bmac_recv(wlc_hw, RX_FIFO, bounded)) {
......@@ -393,9 +388,6 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
__func__, wlc_hw->sih->chip,
wlc_hw->sih->chiprev);
wlc->pub->_cnt->psmwds++;
/* big hammer */
wl_init(wlc->wl);
}
......@@ -408,7 +400,6 @@ bool wlc_dpc(struct wlc_info *wlc, bool bounded)
if (macintstatus & MI_RFDISABLE) {
BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
" RF Disable Input\n", wlc_hw->unit);
wlc->pub->_cnt->rfdisable++;
wl_rfkill_set_hw_state(wlc->wl);
}
......@@ -1036,8 +1027,6 @@ void wlc_bmac_reset(struct wlc_hw_info *wlc_hw)
{
BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
wlc_hw->wlc->pub->_cnt->reset++;
/* reset the core */
if (!DEVICEREMOVED(wlc_hw->wlc))
wlc_bmac_corereset(wlc_hw, WLC_USE_COREFLAGS);
......@@ -2638,41 +2627,35 @@ void wlc_bmac_fifoerrors(struct wlc_hw_info *wlc_hw)
if (intstatus & I_RO) {
wiphy_err(wiphy, "wl%d: fifo %d: receive fifo "
"overflow\n", unit, idx);
wlc_hw->wlc->pub->_cnt->rxoflo++;
fatal = true;
}
if (intstatus & I_PC) {
wiphy_err(wiphy, "wl%d: fifo %d: descriptor error\n",
unit, idx);
wlc_hw->wlc->pub->_cnt->dmade++;
fatal = true;
}
if (intstatus & I_PD) {
wiphy_err(wiphy, "wl%d: fifo %d: data error\n", unit,
idx);
wlc_hw->wlc->pub->_cnt->dmada++;
fatal = true;
}
if (intstatus & I_DE) {
wiphy_err(wiphy, "wl%d: fifo %d: descriptor protocol "
"error\n", unit, idx);
wlc_hw->wlc->pub->_cnt->dmape++;
fatal = true;
}
if (intstatus & I_RU) {
wiphy_err(wiphy, "wl%d: fifo %d: receive descriptor "
"underflow\n", idx, unit);
wlc_hw->wlc->pub->_cnt->rxuflo[idx]++;
}
if (intstatus & I_XU) {
wiphy_err(wiphy, "wl%d: fifo %d: transmit fifo "
"underflow\n", idx, unit);
wlc_hw->wlc->pub->_cnt->txuflo++;
fatal = true;
}
......
drivers/staging/brcm80211/brcmsmac/wlc_main.c
View file @ 40592ba9
......@@ -247,8 +247,6 @@ static u16 wlc_d11hdrs_mac80211(struct wlc_info *wlc,
uint next_frag_len,
wsec_key_t *key,
ratespec_t rspec_override);
static void wlc_ctrupd_cache(u16 cur_stat, u16 *macstat_snapshot, u32 *macstat);
static void wlc_bss_default_init(struct wlc_info *wlc);
static void wlc_ucode_mac_upd(struct wlc_info *wlc);
static ratespec_t mac80211_wlc_set_nrate(struct wlc_info *wlc,
......@@ -1752,9 +1750,6 @@ void *wlc_attach(struct wl_info *wl, u16 vendor, u16 device, uint unit,
wlc->cfg->wlc = wlc;
pub->txmaxpkts = MAXTXPKTS;
pub->_cnt->version = WL_CNT_T_VERSION;
pub->_cnt->length = sizeof(struct wl_cnt);
wlc_wme_initparams_sta(wlc, &wlc->wme_param_ie);
wlc->mimoft = FT_HT;
......@@ -4361,24 +4356,6 @@ void wlc_print_txstatus(tx_status_t *txs)
#endif /* defined(BCMDBG) */
}
static void
wlc_ctrupd_cache(u16 cur_stat, u16 *macstat_snapshot, u32 *macstat)
{
u16 v;
u16 delta;
v = le16_to_cpu(cur_stat);
delta = (u16)(v - *macstat_snapshot);
if (delta != 0) {
*macstat += delta;
*macstat_snapshot = v;
}
}
#define MACSTATUPD(name) \
wlc_ctrupd_cache(macstats.name, &wlc->core->macstat_snapshot->name, &wlc->pub->_cnt->name)
void wlc_statsupd(struct wlc_info *wlc)
{
int i;
......@@ -4406,62 +4383,6 @@ void wlc_statsupd(struct wlc_info *wlc)
wlc_bmac_copyfrom_shm(wlc->hw, M_UCODE_MACSTAT,
&macstats, sizeof(macstat_t));
/* update mac stats */
MACSTATUPD(txallfrm);
MACSTATUPD(txrtsfrm);
MACSTATUPD(txctsfrm);
MACSTATUPD(txackfrm);
MACSTATUPD(txdnlfrm);
MACSTATUPD(txbcnfrm);
for (i = 0; i < NFIFO; i++)
MACSTATUPD(txfunfl[i]);
MACSTATUPD(txtplunfl);
MACSTATUPD(txphyerr);
MACSTATUPD(rxfrmtoolong);
MACSTATUPD(rxfrmtooshrt);
MACSTATUPD(rxinvmachdr);
MACSTATUPD(rxbadfcs);
MACSTATUPD(rxbadplcp);
MACSTATUPD(rxcrsglitch);
MACSTATUPD(rxstrt);
MACSTATUPD(rxdfrmucastmbss);
MACSTATUPD(rxmfrmucastmbss);
MACSTATUPD(rxcfrmucast);
MACSTATUPD(rxrtsucast);
MACSTATUPD(rxctsucast);
MACSTATUPD(rxackucast);
MACSTATUPD(rxdfrmocast);
MACSTATUPD(rxmfrmocast);
MACSTATUPD(rxcfrmocast);
MACSTATUPD(rxrtsocast);
MACSTATUPD(rxctsocast);
MACSTATUPD(rxdfrmmcast);
MACSTATUPD(rxmfrmmcast);
MACSTATUPD(rxcfrmmcast);
MACSTATUPD(rxbeaconmbss);
MACSTATUPD(rxdfrmucastobss);
MACSTATUPD(rxbeaconobss);
MACSTATUPD(rxrsptmout);
MACSTATUPD(bcntxcancl);
MACSTATUPD(rxf0ovfl);
MACSTATUPD(rxf1ovfl);
MACSTATUPD(rxf2ovfl);
MACSTATUPD(txsfovfl);
MACSTATUPD(pmqovfl);
MACSTATUPD(rxcgprqfrm);
MACSTATUPD(rxcgprsqovfl);
MACSTATUPD(txcgprsfail);
MACSTATUPD(txcgprssuc);
MACSTATUPD(prs_timeout);
MACSTATUPD(rxnack);
MACSTATUPD(frmscons);
MACSTATUPD(txnack);
MACSTATUPD(txglitch_nack);
MACSTATUPD(txburst);
MACSTATUPD(phywatchdog);
MACSTATUPD(pktengrxducast);
MACSTATUPD(pktengrxdmcast);
#ifdef BCMDBG
/* check for rx fifo 0 overflow */
delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
......@@ -4486,9 +4407,6 @@ void wlc_statsupd(struct wlc_info *wlc)
dma_counterreset(wlc->hw->di[i]);
}
}
for (i = 0; i < NFIFO; i++)
wlc->pub->_cnt->rxerror += wlc->pub->_cnt->rxuflo[i];
}
bool wlc_chipmatch(u16 vendor, u16 device)
......@@ -4720,7 +4638,6 @@ wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
p = discard_oldest ? bcm_pktq_pdeq(q, eprec) :
bcm_pktq_pdeq_tail(q, eprec);
bcm_pkt_buf_free_skb(p);
wlc->pub->_cnt->txnobuf++;
}
/* Enqueue */
......@@ -4753,7 +4670,6 @@ void wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
* packet flooding from mac80211 stack
*/
bcm_pkt_buf_free_skb(sdu);
wlc->pub->_cnt->txnobuf++;
}
/* Check if flow control needs to be turned on after enqueuing the packet
......@@ -4793,8 +4709,6 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
return -EINVAL;
wlc_txq_enq(wlc, scb, pkt, WLC_PRIO_TO_PREC(prio));
wlc_send_q(wlc);
wlc->pub->_cnt->ieee_tx++;
return 0;
}
......@@ -5713,7 +5627,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
(preamble_type[0] == WLC_GF_PREAMBLE)) {
if (RSPEC2RATE(rspec[0]) != WLC_RATE_1M)
phyctl |= PHY_TXC_SHORT_HDR;
wlc->pub->_cnt->txprshort++;
}
/* phytxant is properly bit shifted */
......@@ -5850,8 +5763,6 @@ void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs)
{
struct wlc_bsscfg *cfg = wlc->cfg;
wlc->pub->_cnt->tbtt++;
if (BSSCFG_STA(cfg)) {
/* run watchdog here if the watchdog timer is not armed */
if (WLC_WATCHDOG_TBTT(wlc)) {
......@@ -5959,14 +5870,6 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
if (tx_info->control.sta)
scb = (struct scb *)tx_info->control.sta->drv_priv;
if (N_ENAB(wlc->pub)) {
u8 *plcp = (u8 *) (txh + 1);
if (PLCP3_ISSGI(plcp[3]))
wlc->pub->_cnt->txmpdu_sgi++;
if (PLCP3_ISSTBC(plcp[3]))
wlc->pub->_cnt->txmpdu_stbc++;
}
if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
wlc_ampdu_dotxstatus(wlc->ampdu, scb, p, txs);
return false;
......@@ -6036,7 +5939,6 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
skb_pull(p, D11_PHY_HDR_LEN);
skb_pull(p, D11_TXH_LEN);
ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p);
wlc->pub->_cnt->ieee_tx_status++;
} else {
wiphy_err(wlc->wiphy, "%s: Not last frame => not calling "
"tx_status\n", __func__);
......@@ -6254,8 +6156,6 @@ wlc_recvctl(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p)
memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
wlc->pub->_cnt->ieee_rx++;
return;
}
......@@ -6296,7 +6196,6 @@ void wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
/* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU subframes */
if (rxh->RxStatus1 & RXS_PBPRES) {
if (p->len < 2) {
wlc->pub->_cnt->rxrunt++;
wiphy_err(wlc->wiphy, "wl%d: wlc_recv: rcvd runt of "
"len %d\n", wlc->pub->unit, p->len);
goto toss;
......@@ -6320,7 +6219,6 @@ void wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
/* check received pkt has at least frame control field */
if (len < D11_PHY_HDR_LEN + sizeof(h->frame_control)) {
wlc->pub->_cnt->rxrunt++;
goto toss;
}
......@@ -6338,10 +6236,8 @@ void wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
"frame with invalid src mac address,"
" a2: %pM\n",
wlc->pub->unit, __func__, h->addr2);
wlc->pub->_cnt->rxbadsrcmac++;
goto toss;
}
wlc->pub->_cnt->rxfrag++;
}
}
......@@ -7068,10 +6964,6 @@ int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifop)
WLC_TX_FIFO_CLEAR(wlc, fifo);
return -EBUSY;
}
if (!ieee80211_is_data(txh->MacFrameControl))
wlc->pub->_cnt->txctl++;
return 0;
}
......
drivers/staging/brcm80211/include/wlioctl.h
View file @ 40592ba9
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7