1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 07:10:18 +02:00

ath9k: merge a few pending cleanup patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24502 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-12-12 01:15:23 +00:00
parent d66d0ec096
commit 9cfc824465
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 <asm/unaligned.h>
#include "hw.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] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff; common->macaddr[2 * i + 1] = eeval & 0xff;
} }

View File

@ -18,7 +18,7 @@
common->ops = &ath9k_common_ops; common->ops = &ath9k_common_ops;
--- a/drivers/net/wireless/ath/ath9k/hw.h --- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/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]; u32 originalGain[22];
int initPDADC; int initPDADC;
int PDADCdelta; int PDADCdelta;

View File

@ -1,8 +1,8 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c --- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/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; AR_STA_ID1_MCAST_KSRCH;
ah->beacon_interval = 100;
ah->enable_32kHz_clock = DONT_USE_32KHZ; ah->enable_32kHz_clock = DONT_USE_32KHZ;
- ah->slottime = (u32) -1; - ah->slottime = (u32) -1;
+ ah->slottime = 9; + ah->slottime = 9;

View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c --- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/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) if (conf->channel && conf->channel->band == IEEE80211_BAND_2GHZ)
acktimeout += 64 - sifstime - ah->slottime; acktimeout += 64 - sifstime - ah->slottime;