package/mac80211/patches/520-ath9k_debugfs_config.patch

   1 --- a/drivers/net/wireless/ath/ath9k/Makefile
   2 +++ b/drivers/net/wireless/ath/ath9k/Makefile
   3 @@ -7,7 +7,7 @@ ath9k-y +=      beacon.o \
   4
   5  ath9k-$(CONFIG_PCI) += pci.o
   6  ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o
   7 -ath9k-$(CONFIG_ATH9K_DEBUG) += debug.o
   8 +ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
   9
  10  obj-$(CONFIG_ATH9K) += ath9k.o
  11
  12 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
  13 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
  14 @@ -483,7 +483,7 @@ struct ath_softc {
  15
  16         int beacon_interval;
  17
  18 -#ifdef CONFIG_ATH9K_DEBUG
  19 +#ifdef CONFIG_ATH9K_DEBUGFS
  20         struct ath9k_debug debug;
  21  #endif
  22         struct ath_beacon_config cur_beacon_conf;
  23 --- a/drivers/net/wireless/ath/ath9k/debug.c
  24 +++ b/drivers/net/wireless/ath/ath9k/debug.c
  25 @@ -31,6 +31,8 @@ static int ath9k_debugfs_open(struct ino
  26         return 0;
  27  }
  28
  29 +#ifdef CONFIG_ATH_DEBUG
  30 +
  31  static ssize_t read_file_debug(struct file *file, char __user *user_buf,
  32                              size_t count, loff_t *ppos)
  33  {
  34 @@ -71,6 +73,8 @@ static const struct file_operations fops
  35         .owner = THIS_MODULE
  36  };
  37
  38 +#endif
  39 +
  40  static ssize_t read_file_dma(struct file *file, char __user *user_buf,
  41                              size_t count, loff_t *ppos)
  42  {
  43 @@ -563,10 +567,12 @@ int ath9k_init_debug(struct ath_hw *ah)
  44         if (!sc->debug.debugfs_phy)
  45                 goto err;
  46
  47 +#ifdef CONFIG_ATH_DEBUG
  48         sc->debug.debugfs_debug = debugfs_create_file("debug",
  49                 S_IRUSR | S_IWUSR, sc->debug.debugfs_phy, sc, &fops_debug);
  50         if (!sc->debug.debugfs_debug)
  51                 goto err;
  52 +#endif
  53
  54         sc->debug.debugfs_dma = debugfs_create_file("dma", S_IRUSR,
  55                                        sc->debug.debugfs_phy, sc, &fops_dma);
  56 --- a/drivers/net/wireless/ath/ath9k/debug.h
  57 +++ b/drivers/net/wireless/ath/ath9k/debug.h
  58 @@ -23,13 +23,13 @@
  59  struct ath_txq;
  60  struct ath_buf;
  61
  62 -#ifdef CONFIG_ATH9K_DEBUG
  63 +#ifdef CONFIG_ATH9K_DEBUGFS
  64  #define TX_STAT_INC(q, c) sc->debug.stats.txstats[q].c++
  65  #else
  66  #define TX_STAT_INC(q, c) do { } while (0)
  67  #endif
  68
  69 -#ifdef CONFIG_ATH9K_DEBUG
  70 +#ifdef CONFIG_ATH9K_DEBUGFS
  71
  72  /**
  73   * struct ath_interrupt_stats - Contains statistics about interrupts
  74 @@ -186,6 +186,6 @@ static inline void ath_debug_stat_retrie
  75  {
  76  }
  77
  78 -#endif /* CONFIG_ATH9K_DEBUG */
  79 +#endif /* CONFIG_ATH9K_DEBUGFS */
  80
  81  #endif /* DEBUG_H */