tools/quilt: update to 0.68

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / ath9k / 500-ath9k_eeprom_debugfs.patch

diff --git a/package/kernel/mac80211/patches/ath9k/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/ath9k/500-ath9k_eeprom_debugfs.patch
index b97837f76de1163943f5da3279b6114cc36c2553..a0ec7ef972f023569e9181170e8a9c1288019d96 100644 (file)
--- a/package/kernel/mac80211/patches/ath9k/500-ath9k_eeprom_debugfs.patch
+++ b/package/kernel/mac80211/patches/ath9k/500-ath9k_eeprom_debugfs.patch
@@ -1,14 +1,24 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1413,6 +1413,54 @@ void ath9k_deinit_debug(struct ath_softc
-       ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
- }
+@@ -1431,6 +1431,7 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 
+       ath9k_cmn_debug_base_eeprom(sc->debug.debugfs_phy, sc->sc_ah);
+       ath9k_cmn_debug_modal_eeprom(sc->debug.debugfs_phy, sc->sc_ah);
++      ath9k_cmn_debug_eeprom(sc->debug.debugfs_phy, sc->sc_ah);
  
+       debugfs_create_u32("gpio_mask", 0600,
+                          sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
+--- a/drivers/net/wireless/ath/ath9k/common-debug.c
++++ b/drivers/net/wireless/ath/ath9k/common-debug.c
+@@ -260,3 +260,58 @@ void ath9k_cmn_debug_phy_err(struct dent
+                           &fops_phy_err);
+ }
+ EXPORT_SYMBOL(ath9k_cmn_debug_phy_err);
++
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
 +                           size_t count, loff_t *ppos)
 +{
-+      struct ath_softc *sc = file->private_data;
-+      struct ath_hw *ah = sc->sc_ah;
++      struct ath_hw *ah = file->private_data;
 +      struct ath_common *common = ath9k_hw_common(ah);
 +      int bytes = 0;
 +      int pos = *ppos;
@@ -52,15 +62,31 @@
 +      .owner = THIS_MODULE
 +};
 +
- int ath9k_init_debug(struct ath_hw *ah)
- {
-       struct ath_common *common = ath9k_hw_common(ah);
-@@ -1432,6 +1479,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-       ath9k_tx99_init_debug(sc);
-       ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
- 
-+      debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
++void ath9k_cmn_debug_eeprom(struct dentry *debugfs_phy,
++                          struct ath_hw *ah)
++{
++      debugfs_create_file("eeprom", S_IRUSR, debugfs_phy, ah,
 +                          &fops_eeprom);
-       debugfs_create_devm_seqfile(sc->dev, "dma", sc->debug.debugfs_phy,
-                                   read_file_dma);
-       debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
++}
++EXPORT_SYMBOL(ath9k_cmn_debug_eeprom);
+--- a/drivers/net/wireless/ath/ath9k/common-debug.h
++++ b/drivers/net/wireless/ath/ath9k/common-debug.h
+@@ -69,6 +69,8 @@ void ath9k_cmn_debug_modal_eeprom(struct
+                                 struct ath_hw *ah);
+ void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy,
+                                struct ath_hw *ah);
++void ath9k_cmn_debug_eeprom(struct dentry *debugfs_phy,
++                          struct ath_hw *ah);
+ void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,
+                            struct ath_rx_status *rs);
+ void ath9k_cmn_debug_recv(struct dentry *debugfs_phy,
+--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
++++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+@@ -514,6 +514,7 @@ int ath9k_htc_init_debug(struct ath_hw *
+ 
+       ath9k_cmn_debug_base_eeprom(priv->debug.debugfs_phy, priv->ah);
+       ath9k_cmn_debug_modal_eeprom(priv->debug.debugfs_phy, priv->ah);
++      ath9k_cmn_debug_eeprom(priv->debug.debugfs_phy, priv->ah);
+ 
+       return 0;
+ }