2009-11-16 17:31:29 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
@@ -15,6 +15,7 @@
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/nl80211.h>
|
|
|
|
|
+#include <linux/ath9k_platform.h>
|
|
|
|
|
#include "ath9k.h"
|
|
|
|
|
#include "btcoex.h"
|
|
|
|
|
|
2010-01-15 01:16:40 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
2010-04-14 00:09:26 +00:00
|
|
|
@@ -542,6 +542,7 @@ static int ath9k_init_softc(u16 devid, s
|
2009-11-16 17:31:29 +00:00
|
|
|
{
|
|
|
|
|
struct ath_hw *ah = NULL;
|
|
|
|
|
struct ath_common *common;
|
|
|
|
|
+ struct ath9k_platform_data *pdata;
|
2010-01-15 01:16:40 +00:00
|
|
|
int ret = 0, i;
|
2009-11-16 17:31:29 +00:00
|
|
|
int csz = 0;
|
|
|
|
|
|
2010-04-14 00:09:26 +00:00
|
|
|
@@ -553,6 +554,10 @@ static int ath9k_init_softc(u16 devid, s
|
2009-11-16 17:31:29 +00:00
|
|
|
ah->hw_version.subsysid = subsysid;
|
2010-01-15 01:16:40 +00:00
|
|
|
sc->sc_ah = ah;
|
|
|
|
|
|
2009-11-16 17:31:29 +00:00
|
|
|
+ pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
|
|
|
|
|
+ if (!pdata)
|
|
|
|
|
+ ah->ah_flags |= AH_USE_EEPROM;
|
|
|
|
|
+
|
|
|
|
|
common = ath9k_hw_common(ah);
|
2010-01-15 01:16:40 +00:00
|
|
|
common->ops = &ath9k_common_ops;
|
|
|
|
|
common->bus_ops = bus_ops;
|
2010-04-14 00:09:26 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
|
|
|
@@ -404,10 +404,6 @@ static void ath9k_hw_init_defaults(struc
|
|
|
|
|
ah->hw_version.magic = AR5416_MAGIC;
|
|
|
|
|
ah->hw_version.subvendorid = 0;
|
|
|
|
|
|
|
|
|
|
- ah->ah_flags = 0;
|
|
|
|
|
- if (!AR_SREV_9100(ah))
|
|
|
|
|
- ah->ah_flags = AH_USE_EEPROM;
|
|
|
|
|
-
|
|
|
|
|
ah->atim_window = 0;
|
|
|
|
|
ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE;
|
|
|
|
|
ah->beacon_interval = 100;
|
