mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13

[openwrt-10.03/.git] / package / mac80211 / patches / 510-ath9k_debugfs_chainmask.patch

diff --git a/package/mac80211/patches/510-ath9k_debugfs_chainmask.patch b/package/mac80211/patches/510-ath9k_debugfs_chainmask.patch
index 157098a69d22918a9530f6e2df6217f2a068023b..7d043d693b70292c405801fe6e36706478a0c012 100644 (file)
--- a/package/mac80211/patches/510-ath9k_debugfs_chainmask.patch
+++ b/package/mac80211/patches/510-ath9k_debugfs_chainmask.patch
@@ -91,7 +91,7 @@
  static ssize_t read_file_dma(struct file *file, char __user *user_buf,
                             size_t count, loff_t *ppos)
  {
-@@ -600,6 +684,16 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -710,6 +794,16 @@ int ath9k_init_debug(struct ath_hw *ah)
                goto err;
  #endif
  
@@ -108,18 +108,18 @@
        sc->debug.debugfs_dma = debugfs_create_file("dma", S_IRUSR,
                                       sc->debug.debugfs_phy, sc, &fops_dma);
        if (!sc->debug.debugfs_dma)
-@@ -643,6 +737,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
+@@ -760,6 +854,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
        struct ath_common *common = ath9k_hw_common(ah);
        struct ath_softc *sc = (struct ath_softc *) common->priv;
  
 +      debugfs_remove(sc->debug.debugfs_tx_chainmask);
 +      debugfs_remove(sc->debug.debugfs_rx_chainmask);
+       debugfs_remove(sc->debug.debugfs_recv);
        debugfs_remove(sc->debug.debugfs_xmit);
        debugfs_remove(sc->debug.debugfs_wiphy);
-       debugfs_remove(sc->debug.debugfs_rcstat);
 --- a/drivers/net/wireless/ath/ath9k/debug.h
 +++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -123,6 +123,8 @@ struct ath_stats {
+@@ -148,6 +148,8 @@ struct ath_stats {
  };
  
  struct ath9k_debug {