Commit 28a1a3bd authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: move sdio used statistics to struct brcmf_sdio 



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: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d5625ee6

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+0 −11
Original line number Diff line number Diff line
@@ -614,21 +614,13 @@ struct brcmf_pub { 
	unsigned long tx_multicast;

	/* Errors in sending data to dongle */

	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 */

	unsigned long rx_packets;

	/* Multicast packets sent up the network interface */

	unsigned long rx_multicast;

	/* Errors processing rx data packets */

	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) */

	unsigned long rx_dropped;

	/* Packets flushed due to unscheduled sendup thread */
@@ -636,8 +628,6 @@ struct brcmf_pub { 
	/* Number of times dpc scheduled by watchdog timer */

	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 */

	unsigned long tx_realloc;

	/* Number of flow control pkts recvd */
@@ -645,7 +635,6 @@ struct brcmf_pub { 


	/* Last error return */

	int bcmerror;

	uint tickcnt;



	/* Last error from dongle */

	int dongle_error;

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+14 −7
Original line number Diff line number Diff line
@@ -546,6 +546,13 @@ struct brcmf_sdio { 
	uint f2rxdata;		/* Number of frame data reads */

	uint f2txdata;		/* Number of f2 frame writes */

	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;

	u32 ctrl_frame_len;
@@ -1774,7 +1781,7 @@ brcmf_sdbrcm_readframes(struct brcmf_sdio *bus, uint maxframes, bool *finished) 
				bus->nextlen = 0;

			}



			bus->drvr->rx_readahead_cnt++;

			bus->rx_readahead_cnt++;



			/* Handle Flow Control */

			fcbits = SDPCM_FCMASK_VALUE(
@@ -2912,9 +2919,9 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen) 
	up(&bus->sdsem);



	if (ret)

		bus->drvr->tx_ctlerrs++;

		bus->tx_ctlerrs++;

	else

		bus->drvr->tx_ctlpkts++;

		bus->tx_ctlpkts++;



	return ret ? -EIO : 0;

}
@@ -2953,9 +2960,9 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen) 
	}



	if (rxlen)

		bus->drvr->rx_ctlpkts++;

		bus->rx_ctlpkts++;

	else

		bus->drvr->rx_ctlerrs++;

		bus->rx_ctlerrs++;



	return rxlen ? (int)rxlen : -ETIMEDOUT;

}
@@ -3436,7 +3443,7 @@ int brcmf_sdbrcm_bus_init(struct device *dev) 
		return 0;



	/* Start the watchdog timer */

	bus->drvr->tickcnt = 0;

	bus->tickcnt = 0;

	brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);



	down(&bus->sdsem);
@@ -3821,7 +3828,7 @@ brcmf_sdbrcm_watchdog_thread(void *data) 
		if (!wait_for_completion_interruptible(&bus->watchdog_wait)) {

			brcmf_sdbrcm_bus_watchdog(bus);

			/* Count the tick for reference */

			bus->drvr->tickcnt++;

			bus->tickcnt++;

		} else

			break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE