Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm80211: fmac: move sdio used statistics to struct brcmf_sdio

Browse source 
Some statistics only used by sdio modules. Move them to sdio layer
private structure brcmf_sdio. This is part of the fullmac bus
interface refactoring.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Franky Lin 2011-12-16 18:37:02 -08:00 committed by John W. Linville
parent d5625ee66f
commit 28a1a3bdaf
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
View file

@ -614,21 +614,13 @@ struct brcmf_pub {
unsigned long tx_multicast; unsigned long tx_multicast;
/* Errors in sending data to dongle */ /* Errors in sending data to dongle */
unsigned long tx_errors; unsigned long tx_errors;
/* Control packets sent to dongle */
unsigned long tx_ctlpkts;
/* Errors sending control frames to dongle */
unsigned long tx_ctlerrs;
/* Packets sent up the network interface */ /* Packets sent up the network interface */
unsigned long rx_packets; unsigned long rx_packets;
/* Multicast packets sent up the network interface */ /* Multicast packets sent up the network interface */
unsigned long rx_multicast; unsigned long rx_multicast;
/* Errors processing rx data packets */ /* Errors processing rx data packets */
unsigned long rx_errors; unsigned long rx_errors;
/* Control frames processed from dongle */
unsigned long rx_ctlpkts;
/* Errors in processing rx control frames */
unsigned long rx_ctlerrs;
/* Packets dropped locally (no memory) */ /* Packets dropped locally (no memory) */
unsigned long rx_dropped; unsigned long rx_dropped;
/* Packets flushed due to unscheduled sendup thread */ /* Packets flushed due to unscheduled sendup thread */
@ -636,8 +628,6 @@ struct brcmf_pub {
/* Number of times dpc scheduled by watchdog timer */ /* Number of times dpc scheduled by watchdog timer */
unsigned long wd_dpc_sched; unsigned long wd_dpc_sched;
/* Number of packets where header read-ahead was used. */
unsigned long rx_readahead_cnt;
/* Number of tx packets we had to realloc for headroom */ /* Number of tx packets we had to realloc for headroom */
unsigned long tx_realloc; unsigned long tx_realloc;
/* Number of flow control pkts recvd */ /* Number of flow control pkts recvd */
@ -645,7 +635,6 @@ struct brcmf_pub {
/* Last error return */ /* Last error return */
int bcmerror; int bcmerror;
uint tickcnt;
/* Last error from dongle */ /* Last error from dongle */
int dongle_error; int dongle_error;

21
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
View file

@ -546,6 +546,13 @@ struct brcmf_sdio {
uint f2rxdata; /* Number of frame data reads */ uint f2rxdata; /* Number of frame data reads */
uint f2txdata; /* Number of f2 frame writes */ uint f2txdata; /* Number of f2 frame writes */
uint f1regdata; /* Number of f1 register accesses */ uint f1regdata; /* Number of f1 register accesses */
uint tickcnt; /* Number of watchdog been schedule */
unsigned long tx_ctlerrs; /* Err of sending ctrl frames */
unsigned long tx_ctlpkts; /* Ctrl frames sent to dongle */
unsigned long rx_ctlerrs; /* Err of processing rx ctrl frames */
unsigned long rx_ctlpkts; /* Ctrl frames processed from dongle */
unsigned long rx_readahead_cnt; /* Number of packets where header
* read-ahead was used. */
u8 *ctrl_frame_buf; u8 *ctrl_frame_buf;
u32 ctrl_frame_len; u32 ctrl_frame_len;
@ -1774,7 +1781,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished)
bus->nextlen = 0; bus->nextlen = 0;
} }
bus->drvr->rx_readahead_cnt++; bus->rx_readahead_cnt++;
/* Handle Flow Control */ /* Handle Flow Control */
fcbits = SDPCM_FCMASK_VALUE( fcbits = SDPCM_FCMASK_VALUE(
@ -2912,9 +2919,9 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
up(&bus->sdsem); up(&bus->sdsem);
if (ret) if (ret)
bus->drvr->tx_ctlerrs++; bus->tx_ctlerrs++;
else else
bus->drvr->tx_ctlpkts++; bus->tx_ctlpkts++;
return ret ? -EIO : 0; return ret ? -EIO : 0;
} }
@ -2953,9 +2960,9 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
} }
if (rxlen) if (rxlen)
bus->drvr->rx_ctlpkts++; bus->rx_ctlpkts++;
else else
bus->drvr->rx_ctlerrs++; bus->rx_ctlerrs++;
return rxlen ? (int)rxlen : -ETIMEDOUT; return rxlen ? (int)rxlen : -ETIMEDOUT;
} }
@ -3436,7 +3443,7 @@ int brcmf_sdbrcm_bus_init(struct device *dev)
return 0; return 0;
/* Start the watchdog timer */ /* Start the watchdog timer */
bus->drvr->tickcnt = 0; bus->tickcnt = 0;
brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS); brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);
down(&bus->sdsem); down(&bus->sdsem);
@ -3821,7 +3828,7 @@ brcmf_sdbrcm_watchdog_thread(void *data)
if (!wait_for_completion_interruptible(&bus->watchdog_wait)) { if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {
brcmf_sdbrcm_bus_watchdog(bus); brcmf_sdbrcm_bus_watchdog(bus);
/* Count the tick for reference */ /* Count the tick for reference */
bus->drvr->tickcnt++; bus->tickcnt++;
} else } else
break; break;
} }