mac80211: update to 2012-04-17, adds some build fixes and juhosg's ar9380 tx power fix

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

diff --git a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index eaf51310e2a163ad8a194dc3277bc172d0bda292..49e80ca3e6573741dc5ad3a6b1a17061dffe0dae 100644 (file)
--- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -873,6 +873,53 @@ static const struct file_operations fops
-       .llseek = default_llseek,
- };
+@@ -1532,6 +1532,53 @@ static const struct file_operations fops
+ 
+ #endif
  
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
 +                           size_t count, loff_t *ppos)
@@ -47,21 +47,19 @@
 +
 +static const struct file_operations fops_eeprom = {
 +      .read = read_file_eeprom,
-+      .open = ath9k_debugfs_open,
++      .open = simple_open,
 +      .owner = THIS_MODULE
 +};
 +
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -938,6 +985,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1595,5 +1642,8 @@ int ath9k_init_debug(struct ath_hw *ah)
        debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
  
-+      if (!debugfs_create_file("eeprom", S_IRUSR,
-+                      sc->debug.debugfs_phy, sc, &fops_eeprom))
-+              goto err;
++      debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
++                          &fops_eeprom);
 +
-       sc->debug.regidx = 0;
        return 0;
- err:
+ }