brcm80211: fmac: move dongle statistics to struct brcmf_bus
Dongle statistics are shared data between common layer and bus
layer. This patch places them in bus interface structure brcmf_bus
as 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>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 4f5ec43..e456099 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -340,9 +340,9 @@
done:
if (ret)
- drvr->dstats.tx_dropped++;
+ drvr->bus_if->dstats.tx_dropped++;
else
- drvr->dstats.tx_packets++;
+ drvr->bus_if->dstats.tx_packets++;
/* Return ok: we always eat the packet */
return 0;
@@ -427,7 +427,7 @@
skb->protocol = eth_type_trans(skb, skb->dev);
if (skb->pkt_type == PACKET_MULTICAST)
- drvr->dstats.multicast++;
+ bus_if->dstats.multicast++;
skb->data = eth;
skb->len = len;
@@ -446,8 +446,8 @@
ifp->ndev->last_rx = jiffies;
}
- drvr->dstats.rx_bytes += skb->len;
- drvr->dstats.rx_packets++; /* Local count */
+ bus_if->dstats.rx_bytes += skb->len;
+ bus_if->dstats.rx_packets++; /* Local count */
if (in_interrupt())
netif_rx(skb);
@@ -483,20 +483,20 @@
static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev)
{
struct brcmf_if *ifp = netdev_priv(ndev);
- struct brcmf_pub *drvr = ifp->drvr;
+ struct brcmf_bus *bus_if = ifp->drvr->bus_if;
brcmf_dbg(TRACE, "Enter\n");
/* Copy dongle stats to net device stats */
- ifp->stats.rx_packets = drvr->dstats.rx_packets;
- ifp->stats.tx_packets = drvr->dstats.tx_packets;
- ifp->stats.rx_bytes = drvr->dstats.rx_bytes;
- ifp->stats.tx_bytes = drvr->dstats.tx_bytes;
- ifp->stats.rx_errors = drvr->dstats.rx_errors;
- ifp->stats.tx_errors = drvr->dstats.tx_errors;
- ifp->stats.rx_dropped = drvr->dstats.rx_dropped;
- ifp->stats.tx_dropped = drvr->dstats.tx_dropped;
- ifp->stats.multicast = drvr->dstats.multicast;
+ ifp->stats.rx_packets = bus_if->dstats.rx_packets;
+ ifp->stats.tx_packets = bus_if->dstats.tx_packets;
+ ifp->stats.rx_bytes = bus_if->dstats.rx_bytes;
+ ifp->stats.tx_bytes = bus_if->dstats.tx_bytes;
+ ifp->stats.rx_errors = bus_if->dstats.rx_errors;
+ ifp->stats.tx_errors = bus_if->dstats.tx_errors;
+ ifp->stats.rx_dropped = bus_if->dstats.rx_dropped;
+ ifp->stats.tx_dropped = bus_if->dstats.tx_dropped;
+ ifp->stats.multicast = bus_if->dstats.multicast;
return &ifp->stats;
}