5 files changed, 43 insertions, 0 deletions

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 89ccf0d50f33..fa1549a03c71 100644
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -817,6 +817,10 @@ struct b43_wldev {
         /* Debugging stuff follows. */
 #ifdef CONFIG_B43_DEBUG
         struct b43_dfsentry *dfsentry;
+        unsigned int irq_count;
+        unsigned int irq_bit_count[32];
+        unsigned int tx_count;
+        unsigned int rx_count;
 #endif
 };
 
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index 8f64943e3f60..80b19a44a407 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -689,6 +689,7 @@ static void b43_add_dynamic_debug(struct b43_wldev *dev)
         add_dyn_dbg("debug_lo", B43_DBG_LO, 0);
         add_dyn_dbg("debug_firmware", B43_DBG_FIRMWARE, 0);
         add_dyn_dbg("debug_keys", B43_DBG_KEYS, 0);
+        add_dyn_dbg("debug_verbose_stats", B43_DBG_VERBOSESTATS, 0);
 
 #undef add_dyn_dbg
 }
diff --git a/drivers/net/wireless/b43/debugfs.h b/drivers/net/wireless/b43/debugfs.h
index e47b4b488b04..822aad8842f4 100644
--- a/drivers/net/wireless/b43/debugfs.h
+++ b/drivers/net/wireless/b43/debugfs.h
@@ -13,6 +13,7 @@ enum b43_dyndbg {		/* Dynamic debugging features */
         B43_DBG_LO,
         B43_DBG_FIRMWARE,
         B43_DBG_KEYS,
+        B43_DBG_VERBOSESTATS,
         __B43_NR_DYNDBG,
 };
 
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7d22dadfd890..6468bbeba687 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1830,6 +1830,16 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)
 
         /* Re-enable interrupts on the device by restoring the current interrupt mask. */
         b43_write32(dev, B43_MMIO_GEN_IRQ_MASK, dev->irq_mask);
+
+#if B43_DEBUG
+        if (b43_debug(dev, B43_DBG_VERBOSESTATS)) {
+                dev->irq_count++;
+                for (i = 0; i < ARRAY_SIZE(dev->irq_bit_count); i++) {
+                        if (reason & (1 << i))
+                                dev->irq_bit_count[i]++;
+                }
+        }
+#endif
 }
 
 /* Interrupt thread handler. Handles device interrupts in thread context. */
@@ -2893,6 +2903,27 @@ static void b43_periodic_every15sec(struct b43_wldev *dev)
 
         atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);
         wmb();
+
+#if B43_DEBUG
+        if (b43_debug(dev, B43_DBG_VERBOSESTATS)) {
+                unsigned int i;
+
+                b43dbg(dev->wl, "Stats: %7u IRQs/sec, %7u TX/sec, %7u RX/sec\n",
+                       dev->irq_count / 15,
+                       dev->tx_count / 15,
+                       dev->rx_count / 15);
+                dev->irq_count = 0;
+                dev->tx_count = 0;
+                dev->rx_count = 0;
+                for (i = 0; i < ARRAY_SIZE(dev->irq_bit_count); i++) {
+                        if (dev->irq_bit_count[i]) {
+                                b43dbg(dev->wl, "Stats: %7u IRQ-%02u/sec (0x%08X)\n",
+                                       dev->irq_bit_count[i] / 15, i, (1 << i));
+                                dev->irq_bit_count[i] = 0;
+                        }
+                }
+        }
+#endif
 }
 
 static void do_periodic_work(struct b43_wldev *dev)
@@ -3092,6 +3123,9 @@ static void b43_tx_work(struct work_struct *work)
                         dev_kfree_skb(skb); /* Drop it */
         }
 
+#if B43_DEBUG
+        dev->tx_count++;
+#endif
         mutex_unlock(&wl->mutex);
 }
 
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index c403c616d3bd..ac9f600995e4 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -692,6 +692,9 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
         memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
         ieee80211_rx(dev->wl->hw, skb);
 
+#if B43_DEBUG
+        dev->rx_count++;
+#endif
         return;
 drop:
         b43dbg(dev->wl, "RX: Packet dropped\n");