Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / brcm80211 / brcmfmac / usb.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index bc5a042c9a96aa3e25b61a046fe8610b92d5135f..42289e9ea8863d0bee3d04a78dbcdf0e46d17c5d 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -420,10 +420,6 @@ static void brcmf_usb_tx_complete(struct urb *urb)
        brcmf_dbg(USB, "Enter, urb->status=%d, skb=%p\n", urb->status,
                  req->skb);
        brcmf_usb_del_fromq(devinfo, req);
-       if (urb->status == 0)
-               devinfo->bus_pub.bus->dstats.tx_packets++;
-       else
-               devinfo->bus_pub.bus->dstats.tx_errors++;
 
        brcmf_txcomplete(devinfo->dev, req->skb, urb->status == 0);
 
@@ -450,10 +446,7 @@ static void brcmf_usb_rx_complete(struct urb *urb)
        req->skb = NULL;
 
        /* zero lenght packets indicate usb "failure". Do not refill */
-       if (urb->status == 0 && urb->actual_length) {
-               devinfo->bus_pub.bus->dstats.rx_packets++;
-       } else {
-               devinfo->bus_pub.bus->dstats.rx_errors++;
+       if (urb->status != 0 || !urb->actual_length) {
                brcmu_pkt_buf_free_skb(skb);
                brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req, NULL);
                return;
@@ -1256,6 +1249,8 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
        bus->bus_priv.usb = bus_pub;
        dev_set_drvdata(dev, bus);
        bus->ops = &brcmf_usb_bus_ops;
+       bus->chip = bus_pub->devid;
+       bus->chiprev = bus_pub->chiprev;
 
        /* Attach to the common driver interface */
        ret = brcmf_attach(0, dev);