qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

mac80211: backport 2011-01-24 from trunk

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25198 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2011-01-28 13:31:36 +00:00
parent bdcad9402e
commit 6850d22cf4
26 changed files with 2690 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/mac80211/patches/451-add-platform-eeprom-support-to-ath5k.patch
View File

@@ -9,7 +9,7 @@
#include "ath5k.h"
#include "reg.h"
@@ -1726,7 +1728,7 @@ ath5k_eeprom_read_spur_chans(struct ath5
@@ -1722,7 +1724,7 @@ ath5k_eeprom_read_spur_chans(struct ath5
}
/*
@@ -18,10 +18,10 @@
*/
int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
{
@@ -1734,6 +1736,16 @@ int ath5k_eeprom_read_mac(struct ath5k_h
@@ -1730,6 +1732,16 @@ int ath5k_eeprom_read_mac(struct ath5k_h
u32 total, offset;
u16 data;
int octet, ret;
int octet;
+ struct ath5k_platform_data *pdata = NULL;
+
+ if (ah->ah_sc->pdev)
@@ -33,8 +33,8 @@
+ return 0;
+ }
ret = ath5k_hw_nvram_read(ah, 0x20, &data);
if (ret)
AR5K_EEPROM_READ(0x20, data);
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -17,6 +17,7 @@
@@ -45,7 +45,7 @@
#include "../ath.h"
#include "ath5k.h"
#include "debug.h"
@@ -73,6 +74,19 @@ bool ath5k_pci_eeprom_read(struct ath_co
@@ -74,6 +75,19 @@ ath5k_pci_eeprom_read(struct ath_common
{
struct ath5k_hw *ah = (struct ath5k_hw *) common->ah;
u32 status, timeout;