ath9k: merge a few pending cleanup patches

SVN-Revision: 24502
This commit is contained in:
Felix Fietkau 2010-12-12 01:15:23 +00:00
parent 0ea5f613de
commit 4d4ee55485
5 changed files with 1662 additions and 5 deletions

File diff suppressed because it is too large Load diff

View file

@ -8,7 +8,7 @@
#include <asm/unaligned.h>
#include "hw.h"
@@ -436,8 +437,16 @@ static int ath9k_hw_init_macaddr(struct
@@ -428,8 +429,16 @@ static int ath9k_hw_init_macaddr(struct
common->macaddr[2 * i] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff;
}

View file

@ -18,7 +18,7 @@
common->ops = &ath9k_common_ops;
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -794,7 +794,7 @@ struct ath_hw {
@@ -787,7 +787,7 @@ struct ath_hw {
u32 originalGain[22];
int initPDADC;
int PDADCdelta;

View file

@ -1,8 +1,8 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -417,7 +417,7 @@ static void ath9k_hw_init_defaults(struc
@@ -409,7 +409,7 @@ static void ath9k_hw_init_defaults(struc
AR_STA_ID1_CRPT_MIC_ENABLE |
AR_STA_ID1_MCAST_KSRCH;
ah->beacon_interval = 100;
ah->enable_32kHz_clock = DONT_USE_32KHZ;
- ah->slottime = (u32) -1;
+ ah->slottime = 9;

View file

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -813,7 +813,7 @@ void ath9k_hw_init_global_settings(struc
@@ -817,7 +817,7 @@ void ath9k_hw_init_global_settings(struc
if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
acktimeout += 64 - sifstime - ah->slottime;