diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-08-31 23:34:21 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-08-31 23:34:21 +0000 |
| commit | 2f014eb8e82152c3e31fba135b45cdf026de7fd1 (patch) | |
| tree | 509489e635a0f907a8838797bfbaf7f105afc883 /package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch | |
| parent | ece9b523e446692c9361336d1f0b6cbd6a3df257 (diff) | |
| download | upstream-2f014eb8e82152c3e31fba135b45cdf026de7fd1.tar.gz upstream-2f014eb8e82152c3e31fba135b45cdf026de7fd1.tar.bz2 upstream-2f014eb8e82152c3e31fba135b45cdf026de7fd1.zip | |
mac80211: update to wireless-testing 2010-08-31
SVN-Revision: 22865
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.patch | 13 |
1 files changed, 6 insertions, 7 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 index 717acd2342..a03b599449 100644 --- a/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch +++ b/package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch @@ -1,6 +1,6 @@ ---- a/drivers/net/wireless/ath/ath5k/eeprom.c 2010-06-23 03:08:32.000000000 +0200 -+++ b/drivers/net/wireless/ath/ath5k/eeprom.c 2010-06-23 05:59:30.000000000 +0200 -@@ -22,6 +23,8 @@ +--- a/drivers/net/wireless/ath/ath5k/eeprom.c ++++ b/drivers/net/wireless/ath/ath5k/eeprom.c +@@ -22,6 +22,8 @@ \*************************************/ #include <linux/slab.h> @@ -9,7 +9,7 @@ #include "ath5k.h" #include "reg.h" -@@ -34,6 +37,18 @@ +@@ -34,6 +36,18 @@ static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data) { u32 status, timeout; @@ -28,7 +28,7 @@ /* * Initialize EEPROM access -@@ -1788,7 +1802,7 @@ +@@ -1788,7 +1802,7 @@ ath5k_eeprom_init(struct ath5k_hw *ah) } /* @@ -37,7 +37,7 @@ */ int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) { -@@ -1796,6 +1810,16 @@ +@@ -1796,6 +1810,16 @@ int ath5k_eeprom_read_mac(struct ath5k_h u32 total, offset; u16 data; int octet, ret; @@ -54,4 +54,3 @@ ret = ath5k_hw_eeprom_read(ah, 0x20, &data); if (ret) - |