Commit 9c1a043a authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: move packet realloc stats to struct brcmf_bus 



tx_realloc is used by both common layer and bus layer. This patch
moves it to interface structure brcmf_bus as 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 719f2733

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

+1 −2
Original line number Diff line number Diff line
@@ -578,6 +578,7 @@ struct brcmf_bus { 
	enum brcmf_bus_state state;

	uint maxctl;		/* Max size rxctl request from proto to bus */

	bool drvr_up;		/* Status flag of driver up/down */

	unsigned long tx_realloc;	/* Tx packets realloced for headroom */

	struct dngl_stats dstats;	/* Stats for dongle-based data */

};
@@ -615,8 +616,6 @@ struct brcmf_pub { 
	/* Number of times dpc scheduled by watchdog timer */

	unsigned long wd_dpc_sched;



	/* Number of tx packets we had to realloc for headroom */

	unsigned long tx_realloc;

	/* Number of flow control pkts recvd */

	unsigned long fc_packets;

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

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev) 


		brcmf_dbg(INFO, "%s: insufficient headroom\n",

			  brcmf_ifname(drvr, ifp->idx));

		drvr->tx_realloc++;

		drvr->bus_if->tx_realloc++;

		skb2 = skb_realloc_headroom(skb, drvr->hdrlen);

		dev_kfree_skb(skb);

		skb = skb2;

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

+1 −1
Original line number Diff line number Diff line
@@ -2130,7 +2130,7 @@ static int brcmf_sdbrcm_txpkt(struct brcmf_sdio *bus, struct sk_buff *pkt, 
		if (skb_headroom(pkt) < pad) {

			brcmf_dbg(INFO, "insufficient headroom %d for %d pad\n",

				  skb_headroom(pkt), pad);

			bus->drvr->tx_realloc++;

			bus->sdiodev->bus_if->tx_realloc++;

			new = brcmu_pkt_buf_get_skb(pkt->len + BRCMF_SDALIGN);

			if (!new) {

				brcmf_dbg(ERROR, "couldn't allocate new %d-byte packet\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE