summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-16 21:08:41 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-16 21:08:41 +0000
commit691b253e47367f64097023ba2afcc595ca120786 (patch)
treef3d4a3ace1fce602fa8b9fb1e3c84e817c712d49 /package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch
parentc9641b552eb8ecccb7b0e31a0f7bac250a930e25 (diff)
mac80211: update to wireless-testing 2012-04-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31322 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch')
-rw-r--r--package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch b/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch
deleted file mode 100644
index 6e03d70a74..0000000000
--- a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/drivers/net/wireless/ath/ath5k/pci.c
-+++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -19,6 +19,7 @@
- #include <linux/pci-aspm.h>
- #include <linux/etherdevice.h>
- #include <linux/module.h>
-+#include <linux/ath5k_platform.h>
- #include "../ath.h"
- #include "ath5k.h"
- #include "debug.h"
-@@ -69,7 +70,7 @@ static void ath5k_pci_read_cachesize(str
- }
-
- /*
-- * Read from eeprom
-+ * Read from eeprom or platform_data
- */
- static bool
- ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
-@@ -77,6 +78,19 @@ ath5k_pci_eeprom_read(struct ath_common
- struct ath5k_hw *ah = (struct ath5k_hw *) common->ah;
- u32 status, timeout;
-
-+ struct ath5k_platform_data *pdata = NULL;
-+
-+ if (ah->pdev)
-+ pdata = ah->pdev->dev.platform_data;
-+
-+ if (pdata && pdata->eeprom_data && pdata->eeprom_data[61] == AR5K_EEPROM_MAGIC_VALUE) {
-+ if (offset >= ATH5K_PLAT_EEP_MAX_WORDS)
-+ return false;
-+
-+ *data = pdata->eeprom_data[offset];
-+ return true;
-+ }
-+
- /*
- * Initialize EEPROM access
- */
-@@ -120,6 +134,16 @@ static int ath5k_pci_eeprom_read_mac(str
- u16 data;
- int octet;
-
-+ struct ath5k_platform_data *pdata = NULL;
-+
-+ if (ah->pdev)
-+ pdata = ah->pdev->dev.platform_data;
-+
-+ if (pdata && pdata->macaddr) {
-+ memcpy(mac, pdata->macaddr, ETH_ALEN);
-+ return 0;
-+ }
-+
- AR5K_EEPROM_READ(0x20, data);
-
- for (offset = 0x1f, octet = 0, total = 0; offset >= 0x1d; offset--) {