aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2008-08-14 03:58:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-08-29 16:24:05 -0400
commit60653678939dcbba3aa936250b58179aa3451eee (patch)
tree22c4e65aa2c4f7f0fd6bd26ad0b786cd91250c98 /drivers/net/wireless
parent18d7c65ba6628d2759bd650e7039d6307f2c99e9 (diff)
ath9k: Use definition from ieee80211.h
Also, Max RX-ampdu and mpdu-density are ath9k specific. Rename appropriately. Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath9k/main.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 605599eb6d3f..2b3b11bb564b 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -22,8 +22,6 @@
22#define ATH_PCI_VERSION "0.1" 22#define ATH_PCI_VERSION "0.1"
23 23
24#define IEEE80211_HTCAP_MAXRXAMPDU_FACTOR 13 24#define IEEE80211_HTCAP_MAXRXAMPDU_FACTOR 13
25#define IEEE80211_ACTION_CAT_HT 7
26#define IEEE80211_ACTION_HT_TXCHWIDTH 0
27 25
28static char *dev_info = "ath9k"; 26static char *dev_info = "ath9k";
29 27
@@ -220,11 +218,8 @@ static void ath_key_delete(struct ath_softc *sc, struct ieee80211_key_conf *key)
220 218
221static void setup_ht_cap(struct ieee80211_ht_info *ht_info) 219static void setup_ht_cap(struct ieee80211_ht_info *ht_info)
222{ 220{
223/* Until mac80211 includes these fields */ 221#define ATH9K_HT_CAP_MAXRXAMPDU_65536 0x3 /* 2 ^ 16 */
224 222#define ATH9K_HT_CAP_MPDUDENSITY_8 0x6 /* 8 usec */
225#define IEEE80211_HT_CAP_DSSSCCK40 0x1000
226#define IEEE80211_HT_CAP_MAXRXAMPDU_65536 0x3 /* 2 ^ 16 */
227#define IEEE80211_HT_CAP_MPDUDENSITY_8 0x6 /* 8 usec */
228 223
229 ht_info->ht_supported = 1; 224 ht_info->ht_supported = 1;
230 ht_info->cap = (u16)IEEE80211_HT_CAP_SUP_WIDTH 225 ht_info->cap = (u16)IEEE80211_HT_CAP_SUP_WIDTH
@@ -232,8 +227,8 @@ static void setup_ht_cap(struct ieee80211_ht_info *ht_info)
232 |(u16)IEEE80211_HT_CAP_SGI_40 227 |(u16)IEEE80211_HT_CAP_SGI_40
233 |(u16)IEEE80211_HT_CAP_DSSSCCK40; 228 |(u16)IEEE80211_HT_CAP_DSSSCCK40;
234 229
235 ht_info->ampdu_factor = IEEE80211_HT_CAP_MAXRXAMPDU_65536; 230 ht_info->ampdu_factor = ATH9K_HT_CAP_MAXRXAMPDU_65536;
236 ht_info->ampdu_density = IEEE80211_HT_CAP_MPDUDENSITY_8; 231 ht_info->ampdu_density = ATH9K_HT_CAP_MPDUDENSITY_8;
237 /* setup supported mcs set */ 232 /* setup supported mcs set */
238 memset(ht_info->supp_mcs_set, 0, 16); 233 memset(ht_info->supp_mcs_set, 0, 16);
239 ht_info->supp_mcs_set[0] = 0xff; 234 ht_info->supp_mcs_set[0] = 0xff;