The 802.11 core in the chipsets provides counters that are now
used to provide counter values to mac80211 through get_stats
callback. Counters related to ampdu and wmm (aka. wme) are not
yet incorporated.
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Reviewed-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
drivers/staging/brcm80211/brcmfmac/wl_iw.c | 12 +-
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 35 +++--
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 18 ++--
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 11 +-
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 20 ++--
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 148 ++++++++++++++++-----
drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 10 +-
drivers/staging/brcm80211/include/wlioctl.h | 4 +-
8 files changed, 174 insertions(+), 84 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 1dbc94a..6841b3a 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -3568,7 +3568,7 @@ int
wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
{
int res = 0;
- wl_cnt_t cnt;
+ struct wl_cnt cnt;
int phy_noise;
int rssi;
scb_val_t scb_val;
@@ -3611,11 +3611,13 @@ wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
#endif
#if WIRELESS_EXT > 11
- WL_TRACE("wl_iw_get_wireless_stats counters=%zu\n", sizeof(wl_cnt_t));
+ WL_TRACE("wl_iw_get_wireless_stats counters=%zu\n",
+ sizeof(struct wl_cnt));
- memset(&cnt, 0, sizeof(wl_cnt_t));
+ memset(&cnt, 0, sizeof(struct wl_cnt));
res =
- dev_wlc_bufvar_get(dev, "counters", (char *)&cnt, sizeof(wl_cnt_t));
+ dev_wlc_bufvar_get(dev, "counters", (char *)&cnt,
+ sizeof(struct wl_cnt));
if (res) {
WL_ERROR("wl_iw_get_wireless_stats counters failed error=%d\n",
res);
@@ -3624,7 +3626,7 @@ wl_iw_get_wireless_stats(struct net_device *dev, struct iw_statistics *wstats)
cnt.version = dtoh16(cnt.version);
if (cnt.version != WL_CNT_T_VERSION) {
- WL_TRACE("\tIncorrect version of counters struct: expected %d; got %d\n",
+ WL_TRACE("\tIncorrect counter version: expected %d; got %d\n",
WL_CNT_T_VERSION, cnt.version);
goto done;
}
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index a0e4654..60c35d7 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -497,7 +497,16 @@ static int
wl_ops_get_stats(struct ieee80211_hw *hw,
struct ieee80211_low_level_stats *stats)
{
- WL_ERROR("%s: Enter\n", __func__);
+ struct wl_info *wl = hw->priv;
+ struct wl_cnt *cnt;
+
+ WL_LOCK(wl);
+ cnt = wl->pub->_cnt;
+ stats->dot11ACKFailureCount = cnt->txnoack;
+ stats->dot11RTSFailureCount = cnt->txnocts;
+ stats->dot11FCSErrorCount = cnt->rxcrc;
+ stats->dot11RTSSuccessCount = cnt->txrts;
+ WL_UNLOCK(wl);
return 0;
}
@@ -1684,34 +1693,34 @@ void wl_free_timer(struct wl_info *wl, wl_timer_t *t)
static int wl_linux_watchdog(void *ctx)
{
struct wl_info *wl = (struct wl_info *) ctx;
+ struct wl_cnt *cnt;
struct net_device_stats *stats = NULL;
uint id;
/* refresh stats */
if (wl->pub->up) {
ASSERT(wl->stats_id < 2);
+ cnt = wl->pub->_cnt;
id = 1 - wl->stats_id;
-
stats = &wl->stats_watchdog[id];
- stats->rx_packets = WLCNTVAL(wl->pub->_cnt->rxframe);
- stats->tx_packets = WLCNTVAL(wl->pub->_cnt->txframe);
- stats->rx_bytes = WLCNTVAL(wl->pub->_cnt->rxbyte);
- stats->tx_bytes = WLCNTVAL(wl->pub->_cnt->txbyte);
- stats->rx_errors = WLCNTVAL(wl->pub->_cnt->rxerror);
- stats->tx_errors = WLCNTVAL(wl->pub->_cnt->txerror);
+ stats->rx_packets = cnt->rxframe;
+ stats->tx_packets = cnt->txframe;
+ stats->rx_bytes = cnt->rxbyte;
+ stats->tx_bytes = cnt->txbyte;
+ stats->rx_errors = cnt->rxerror;
+ stats->tx_errors = cnt->txerror;
stats->collisions = 0;
stats->rx_length_errors = 0;
- stats->rx_over_errors = WLCNTVAL(wl->pub->_cnt->rxoflo);
- stats->rx_crc_errors = WLCNTVAL(wl->pub->_cnt->rxcrc);
+ stats->rx_over_errors = cnt->rxoflo;
+ stats->rx_crc_errors = cnt->rxcrc;
stats->rx_frame_errors = 0;
- stats->rx_fifo_errors = WLCNTVAL(wl->pub->_cnt->rxoflo);
+ stats->rx_fifo_errors = cnt->rxoflo;
stats->rx_missed_errors = 0;
- stats->tx_fifo_errors = WLCNTVAL(wl->pub->_cnt->txuflo);
+ stats->tx_fifo_errors = cnt->txuflo;
wl->stats_id = id;
-
}
return 0;
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
index 7a9fdbb..2db96c1 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
@@ -70,13 +70,13 @@ static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,
{
struct wlc_pub *pub;
- pub = (struct wlc_pub *) wlc_calloc(osh, unit, sizeof(struct wlc_pub));
+ pub = wlc_calloc(osh, unit, sizeof(struct wlc_pub));
if (pub == NULL) {
*err = 1001;
goto fail;
}
- pub->tunables = (wlc_tunables_t *)wlc_calloc(osh, unit,
+ pub->tunables = wlc_calloc(osh, unit,
sizeof(wlc_tunables_t));
if (pub->tunables == NULL) {
*err = 1028;
@@ -86,6 +86,10 @@ static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,
/* need to init the tunables now */
wlc_tunables_init(pub->tunables, devid);
+ pub->_cnt = wlc_calloc(osh, unit, sizeof(struct wl_cnt));
+ if (pub->_cnt == NULL)
+ goto fail;
+
pub->multicast = (u8 *)wlc_calloc(osh, unit,
(ETH_ALEN * MAXMULTILIST));
if (pub->multicast == NULL) {
@@ -105,13 +109,9 @@ static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub)
if (pub == NULL)
return;
- if (pub->multicast)
- kfree(pub->multicast);
- if (pub->tunables) {
- kfree(pub->tunables);
- pub->tunables = NULL;
- }
-
+ kfree(pub->multicast);
+ kfree(pub->_cnt);
+ kfree(pub->tunables);
kfree(pub);
}
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index f5ca897..f6e27f6 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -38,6 +38,11 @@
#include <wl_export.h>
#include <wl_dbg.h>
+/*
+ * Disable AMPDU statistics counters for now
+ */
+#define WLCNTINCR(a)
+#define WLCNTADD(a, b)
#define AMPDU_MAX_MPDU 32 /* max number of mpdus in an ampdu */
#define AMPDU_NUM_MPDU_LEGACY 16 /* max number of mpdus in an ampdu to a legacy */
@@ -1043,10 +1048,10 @@ 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;
- WLCNTINCR(wlc->pub->_cnt->txchanrej);
+ wlc->pub->_cnt->txchanrej++;
} else if (supr_status == TX_STATUS_SUPR_EXPTIME) {
- WLCNTINCR(wlc->pub->_cnt->txexptime);
+ wlc->pub->_cnt->txexptime++;
/* TX underflow : try tuning pre-loading or ampdu size */
} else if (supr_status == TX_STATUS_SUPR_FRAG) {
@@ -1060,7 +1065,7 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
}
} else if (txs->phyerr) {
update_rate = false;
- WLCNTINCR(wlc->pub->_cnt->txphyerr);
+ wlc->pub->_cnt->txphyerr++;
WL_ERROR("wl%d: wlc_ampdu_dotxstatus: tx phy error (0x%x)\n",
wlc->pub->unit, txs->phyerr);
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index 5f0e7e6..607889c 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -383,7 +383,7 @@ bool BCMFASTPATH wlc_dpc(struct wlc_info *wlc, bool bounded)
/* phy tx error */
if (macintstatus & MI_PHYTXERR) {
- WLCNTINCR(wlc->pub->_cnt->txphyerr);
+ wlc->pub->_cnt->txphyerr++;
}
/* received data or control frame, MI_DMAINT is indication of RX_FIFO interrupt */
@@ -413,7 +413,7 @@ bool BCMFASTPATH wlc_dpc(struct wlc_info *wlc, bool bounded)
__func__, wlc_hw->sih->chip,
wlc_hw->sih->chiprev);
- WLCNTINCR(wlc->pub->_cnt->psmwds);
+ wlc->pub->_cnt->psmwds++;
/* big hammer */
wl_init(wlc->wl);
@@ -427,7 +427,7 @@ bool BCMFASTPATH wlc_dpc(struct wlc_info *wlc, bool bounded)
if (macintstatus & MI_RFDISABLE) {
WL_TRACE("wl%d: BMAC Detected a change on the RF Disable Input\n", wlc_hw->unit);
- WLCNTINCR(wlc->pub->_cnt->rfdisable);
+ wlc->pub->_cnt->rfdisable++;
wl_rfkill_set_hw_state(wlc->wl);
}
@@ -1088,7 +1088,7 @@ void wlc_bmac_reset(struct wlc_hw_info *wlc_hw)
{
WL_TRACE("wl%d: wlc_bmac_reset\n", wlc_hw->unit);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->reset);
+ wlc_hw->wlc->pub->_cnt->reset++;
/* reset the core */
if (!DEVICEREMOVED(wlc_hw->wlc))
@@ -2877,40 +2877,40 @@ void wlc_bmac_fifoerrors(struct wlc_hw_info *wlc_hw)
if (intstatus & I_RO) {
WL_ERROR("wl%d: fifo %d: receive fifo overflow\n",
unit, idx);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->rxoflo);
+ wlc_hw->wlc->pub->_cnt->rxoflo++;
fatal = true;
}
if (intstatus & I_PC) {
WL_ERROR("wl%d: fifo %d: descriptor error\n",
unit, idx);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmade);
+ wlc_hw->wlc->pub->_cnt->dmade++;
fatal = true;
}
if (intstatus & I_PD) {
WL_ERROR("wl%d: fifo %d: data error\n", unit, idx);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmada);
+ wlc_hw->wlc->pub->_cnt->dmada++;
fatal = true;
}
if (intstatus & I_DE) {
WL_ERROR("wl%d: fifo %d: descriptor protocol error\n",
unit, idx);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->dmape);
+ wlc_hw->wlc->pub->_cnt->dmape++;
fatal = true;
}
if (intstatus & I_RU) {
WL_ERROR("wl%d: fifo %d: receive descriptor underflow\n",
idx, unit);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->rxuflo[idx]);
+ wlc_hw->wlc->pub->_cnt->rxuflo[idx]++;
}
if (intstatus & I_XU) {
WL_ERROR("wl%d: fifo %d: transmit fifo underflow\n",
idx, unit);
- WLCNTINCR(wlc_hw->wlc->pub->_cnt->txuflo);
+ wlc_hw->wlc->pub->_cnt->txuflo++;
fatal = true;
}
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index 6158a84..dc7375d 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -53,6 +53,12 @@
#include <net/mac80211.h>
#include <wl_dbg.h>
+/*
+ * Disable statistics counting for WME
+ */
+#define WLCNTSET(a, b)
+#define WLCNTINCR(a)
+#define WLCNTADD(a, b)
/*
* WPA(2) definitions
@@ -379,13 +385,11 @@ void wlc_reset(struct wlc_info *wlc)
wlc->check_for_unaligned_tbtt = false;
/* slurp up hw mac counters before core reset */
- if (WLC_UPDATE_STATS(wlc)) {
- wlc_statsupd(wlc);
+ wlc_statsupd(wlc);
- /* reset our snapshot of macstat counters */
- memset((char *)wlc->core->macstat_snapshot, 0,
- sizeof(macstat_t));
- }
+ /* reset our snapshot of macstat counters */
+ memset((char *)wlc->core->macstat_snapshot, 0,
+ sizeof(macstat_t));
wlc_bmac_reset(wlc->hw);
wlc_ampdu_reset(wlc->ampdu);
@@ -1947,8 +1951,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
wlc->cfg->wlc = wlc;
pub->txmaxpkts = MAXTXPKTS;
- WLCNTSET(pub->_cnt->version, WL_CNT_T_VERSION);
- WLCNTSET(pub->_cnt->length, sizeof(wl_cnt_t));
+ pub->_cnt->version = WL_CNT_T_VERSION;
+ pub->_cnt->length = sizeof(struct wl_cnt);
WLCNTSET(pub->_wme_cnt->version, WL_WME_CNT_VERSION);
WLCNTSET(pub->_wme_cnt->length, sizeof(wl_wme_cnt_t));
@@ -2501,8 +2505,7 @@ static void wlc_watchdog(void *arg)
wlc_bmac_watchdog(wlc);
/* occasionally sample mac stat counters to detect 16-bit counter wrap */
- if ((WLC_UPDATE_STATS(wlc))
- && (!(wlc->pub->now % SW_TIMER_MAC_STAT_UPD)))
+ if ((wlc->pub->now % SW_TIMER_MAC_STAT_UPD) == 0)
wlc_statsupd(wlc);
/* Manage TKIP countermeasures timers */
@@ -3855,19 +3858,18 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
case WLC_GET_PKTCNTS:{
get_pktcnt_t *pktcnt = (get_pktcnt_t *) pval;
- if (WLC_UPDATE_STATS(wlc))
- wlc_statsupd(wlc);
- pktcnt->rx_good_pkt = WLCNTVAL(wlc->pub->_cnt->rxframe);
- pktcnt->rx_bad_pkt = WLCNTVAL(wlc->pub->_cnt->rxerror);
+ wlc_statsupd(wlc);
+ pktcnt->rx_good_pkt = wlc->pub->_cnt->rxframe;
+ pktcnt->rx_bad_pkt = wlc->pub->_cnt->rxerror;
pktcnt->tx_good_pkt =
- WLCNTVAL(wlc->pub->_cnt->txfrmsnt);
+ wlc->pub->_cnt->txfrmsnt;
pktcnt->tx_bad_pkt =
- WLCNTVAL(wlc->pub->_cnt->txerror) +
- WLCNTVAL(wlc->pub->_cnt->txfail);
+ wlc->pub->_cnt->txerror +
+ wlc->pub->_cnt->txfail;
if (len >= (int)sizeof(get_pktcnt_t)) {
/* Be backward compatible - only if buffer is large enough */
pktcnt->rx_ocast_good_pkt =
- WLCNTVAL(wlc->pub->_cnt->rxmfrmocast);
+ wlc->pub->_cnt->rxmfrmocast;
}
break;
}
@@ -4746,12 +4748,28 @@ 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 = ltoh16(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;
+ macstat_t macstats;
#ifdef BCMDBG
u16 delta;
u16 rxf0ovfl;
@@ -4771,6 +4789,66 @@ void wlc_statsupd(struct wlc_info *wlc)
txfunfl[i] = wlc->core->macstat_snapshot->txfunfl[i];
#endif /* BCMDBG */
+ /* Read mac stats from contiguous shared memory */
+ 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);
@@ -4828,7 +4906,7 @@ void wlc_statsupd(struct wlc_info *wlc)
wlc->pub->_cnt->rxgiant + wlc->pub->_cnt->rxnoscb +
wlc->pub->_cnt->rxbadsrcmac);
for (i = 0; i < NFIFO; i++)
- WLCNTADD(wlc->pub->_cnt->rxerror, wlc->pub->_cnt->rxuflo[i]);
+ wlc->pub->_cnt->rxerror += wlc->pub->_cnt->rxuflo[i];
}
bool wlc_chipmatch(u16 vendor, u16 device)
@@ -5075,7 +5153,7 @@ wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
ASSERT(0);
pkt_buf_free_skb(wlc->osh, p, true);
- WLCNTINCR(wlc->pub->_cnt->txnobuf);
+ wlc->pub->_cnt->txnobuf++;
}
/* Enqueue */
@@ -5108,7 +5186,7 @@ void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
/* ASSERT(9 == 8); *//* XXX we might hit this condtion in case packet flooding from mac80211 stack */
pkt_buf_free_skb(wlc->osh, sdu, true);
- WLCNTINCR(wlc->pub->_cnt->txnobuf);
+ wlc->pub->_cnt->txnobuf++;
}
/* Check if flow control needs to be turned on after enqueuing the packet
@@ -5160,7 +5238,7 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
wlc_txq_enq(wlc, scb, pkt, WLC_PRIO_TO_PREC(prio));
wlc_send_q(wlc, wlc->active_queue);
- WLCNTINCR(wlc->pub->_cnt->ieee_tx);
+ wlc->pub->_cnt->ieee_tx++;
return 0;
}
@@ -6206,7 +6284,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
|| !IS_MCS(rspec[0]));
if (RSPEC2RATE(rspec[0]) != WLC_RATE_1M)
phyctl |= PHY_TXC_SHORT_HDR;
- WLCNTINCR(wlc->pub->_cnt->txprshort);
+ wlc->pub->_cnt->txprshort++;
}
/* phytxant is properly bit shifted */
@@ -6350,7 +6428,7 @@ void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs)
{
wlc_bsscfg_t *cfg = wlc->cfg;
- WLCNTINCR(wlc->pub->_cnt->tbtt);
+ wlc->pub->_cnt->tbtt++;
if (BSSCFG_STA(cfg)) {
/* run watchdog here if the watchdog timer is not armed */
@@ -6468,7 +6546,7 @@ void wlc_high_dpc(struct wlc_info *wlc, u32 macintstatus)
__func__, wlc->pub->sih->chip,
wlc->pub->sih->chiprev);
- WLCNTINCR(wlc->pub->_cnt->psmwds);
+ wlc->pub->_cnt->psmwds++;
/* big hammer */
wl_init(wlc->wl);
@@ -6526,7 +6604,7 @@ static void *wlc_15420war(struct wlc_info *wlc, uint queue)
/* if tx ring is now empty, reset and re-init the tx dma channel */
if (dma_txactive(wlc->hw->di[queue]) == 0) {
- WLCNTINCR(wlc->pub->_cnt->txdmawar);
+ wlc->pub->_cnt->txdmawar++;
if (!dma_txreset(di))
WL_ERROR("wl%d: %s: dma_txreset[%d]: cannot stop dma\n",
wlc->pub->unit, __func__, queue);
@@ -6626,9 +6704,9 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
if (N_ENAB(wlc->pub)) {
u8 *plcp = (u8 *) (txh + 1);
if (PLCP3_ISSGI(plcp[3]))
- WLCNTINCR(wlc->pub->_cnt->txmpdu_sgi);
+ wlc->pub->_cnt->txmpdu_sgi++;
if (PLCP3_ISSTBC(plcp[3]))
- WLCNTINCR(wlc->pub->_cnt->txmpdu_stbc);
+ wlc->pub->_cnt->txmpdu_stbc++;
}
if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
@@ -6700,7 +6778,7 @@ 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);
- WLCNTINCR(wlc->pub->_cnt->ieee_tx_status);
+ wlc->pub->_cnt->ieee_tx_status++;
} else {
WL_ERROR("%s: Not last frame => not calling tx_status\n",
__func__);
@@ -6978,7 +7056,7 @@ wlc_recvctl(struct wlc_info *wlc, struct osl_info *osh, d11rxhdr_t *rxh,
memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
- WLCNTINCR(wlc->pub->_cnt->ieee_rx);
+ wlc->pub->_cnt->ieee_rx++;
osh->pktalloced--;
return;
}
@@ -7034,7 +7112,7 @@ void BCMFASTPATH 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) {
- WLCNTINCR(wlc->pub->_cnt->rxrunt);
+ wlc->pub->_cnt->rxrunt++;
WL_ERROR("wl%d: wlc_recv: rcvd runt of len %d\n",
wlc->pub->unit, p->len);
goto toss;
@@ -7059,7 +7137,7 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
if (len >= D11_PHY_HDR_LEN + sizeof(h->frame_control)) {
fc = ltoh16(h->frame_control);
} else {
- WLCNTINCR(wlc->pub->_cnt->rxrunt);
+ wlc->pub->_cnt->rxrunt++;
goto toss;
}
@@ -7075,10 +7153,10 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
WL_ERROR("wl%d: %s: dropping a frame with "
"invalid src mac address, a2: %pM\n",
wlc->pub->unit, __func__, h->addr2);
- WLCNTINCR(wlc->pub->_cnt->rxbadsrcmac);
+ wlc->pub->_cnt->rxbadsrcmac++;
goto toss;
}
- WLCNTINCR(wlc->pub->_cnt->rxfrag);
+ wlc->pub->_cnt->rxfrag++;
}
}
@@ -7877,7 +7955,7 @@ int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifop)
if ((ltoh16(txh->MacFrameControl) & IEEE80211_FCTL_FTYPE) !=
IEEE80211_FTYPE_DATA)
- WLCNTINCR(wlc->pub->_cnt->txctl);
+ wlc->pub->_cnt->txctl++;
return 0;
}
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
index ca9a5d8..4528b3f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
@@ -17,6 +17,7 @@
#ifndef _wlc_pub_h_
#define _wlc_pub_h_
+#include <wlioctl.h>
#include <wlc_types.h>
#include <wlc_scb.h>
@@ -326,6 +327,8 @@ struct wlc_pub {
bool _lmacproto; /* lmac protocol module included and enabled */
bool phy_11ncapable; /* the PHY/HW is capable of 802.11N */
bool _ampdumac; /* mac assist ampdu enabled or not */
+
+ struct wl_cnt *_cnt; /* low-level counters in driver */
};
/* wl_monitor rx status per packet */
@@ -477,13 +480,6 @@ extern const u8 wme_fifo2ac[];
#define WLC_USE_COREFLAGS 0xffffffff /* invalid core flags, use the saved coreflags */
-#define WLC_UPDATE_STATS(wlc) 0 /* No stats support */
-#define WLCNTINCR(a) /* No stats support */
-#define WLCNTDECR(a) /* No stats support */
-#define WLCNTADD(a, delta) /* No stats support */
-#define WLCNTSET(a, value) /* No stats support */
-#define WLCNTVAL(a) 0 /* No stats support */
-
/* network protection config */
#define WLC_PROT_G_SPEC 1 /* SPEC g protection */
#define WLC_PROT_G_OVR 2 /* SPEC g prot override */
diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h
index 0f79863..2de49b8 100644
--- a/drivers/staging/brcm80211/include/wlioctl.h
+++ b/drivers/staging/brcm80211/include/wlioctl.h
@@ -1262,7 +1262,7 @@ struct tsinfo_arg {
#define WL_CNT_T_VERSION 7 /* current version of wl_cnt_t struct */
-typedef struct {
+struct wl_cnt {
u16 version; /* see definition of WL_CNT_T_VERSION */
u16 length; /* length of entire structure */
@@ -1492,7 +1492,7 @@ typedef struct {
u32 rxmpdu_sgi; /* count for sgi received */
u32 txmpdu_stbc; /* count for stbc transmit */
u32 rxmpdu_stbc; /* count for stbc received */
-} wl_cnt_t;
+};
#define WL_DELTA_STATS_T_VERSION 1 /* current version of wl_delta_stats_t struct */
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
