From 9475c5b233bc0a50e3aa24b8309e621820cbd0eb Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Fri, 2 Mar 2012 22:55:47 +0100
Subject: [PATCH] --- yaml --- r: 291155 b: refs/heads/master c:
 1d9c1796bc448d76429e0937ef69e4f29cd1adad h: refs/heads/master i:   291153:
 585249f579a19d20fb2b029286a96afa6a9839da   291151:
 f7ebe3e05d2baf73d919be95ecd21864d23a3b5b v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c |  8 ++++----
 trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.h | 11 -----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 35855d2a4511..c92ef4fdd9d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac94f196a5fed4915b82d71b9b111867d78df992
+refs/heads/master: 1d9c1796bc448d76429e0937ef69e4f29cd1adad
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 0418a40fce8d..a2a0c45201ac 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -514,9 +514,9 @@ static void brcmf_usb_tx_complete(struct urb *urb)
 
 	brcmf_usb_del_fromq(devinfo, req);
 	if (urb->status == 0)
-		devinfo->bus_pub.stats.tx_packets++;
+		devinfo->bus_pub.bus->dstats.tx_packets++;
 	else
-		devinfo->bus_pub.stats.tx_errors++;
+		devinfo->bus_pub.bus->dstats.tx_errors++;
 
 	dev_kfree_skb(req->skb);
 	req->skb = NULL;
@@ -536,9 +536,9 @@ static void brcmf_usb_rx_complete(struct urb *urb)
 	req->skb = NULL;
 
 	if (urb->status == 0) {
-		devinfo->bus_pub.stats.rx_packets++;
+		devinfo->bus_pub.bus->dstats.rx_packets++;
 	} else {
-		devinfo->bus_pub.stats.rx_errors++;
+		devinfo->bus_pub.bus->dstats.rx_errors++;
 		dev_kfree_skb(skb);
 		brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req);
 		return;
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.h b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.h
index 3377d63e6c8b..acfa5e89872f 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.h
@@ -33,21 +33,10 @@ enum brcmf_usb_pnp_state {
 };
 
 struct brcmf_stats {
-	u32 tx_errors;
-	u32 tx_packets;
-	u32 tx_multicast;
 	u32 tx_ctlpkts;
 	u32 tx_ctlerrs;
-	u32 tx_dropped;
-	u32 tx_flushed;
-	u32 rx_errors;
-	u32 rx_packets;
-	u32 rx_multicast;
 	u32 rx_ctlpkts;
 	u32 rx_ctlerrs;
-	u32 rx_dropped;
-	u32 rx_flushed;
-
 };
 
 struct brcmf_usbdev {