diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2009-11-23 22:33:27 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:04:40 -0500 |
commit | 902b6667d3d17ac53ec62c036cd2bcf713c29d86 (patch) | |
tree | 95f6d93fc8b0b3f9f021aadc493db27aa3ca0948 /drivers/net/wireless/iwmc3200wifi/eeprom.c | |
parent | f6cd53c6a4204a3d4a274546449a70a766a99b6e (diff) |
iwmc3200wifi: Parse HT channels EEPROM entries
The fat channels eeprom entries let us know if 11n is enabled or not. We
update our wiphy supported bands based on that.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/eeprom.c')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/eeprom.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/eeprom.c b/drivers/net/wireless/iwmc3200wifi/eeprom.c index 365910fbe01e..c574f58dfb20 100644 --- a/drivers/net/wireless/iwmc3200wifi/eeprom.c +++ b/drivers/net/wireless/iwmc3200wifi/eeprom.c | |||
@@ -66,6 +66,10 @@ static struct iwm_eeprom_entry eeprom_map[] = { | |||
66 | [IWM_EEPROM_SKU_CAP] = | 66 | [IWM_EEPROM_SKU_CAP] = |
67 | {"SKU capabilities", IWM_EEPROM_SKU_CAP_OFF, IWM_EEPROM_SKU_CAP_LEN}, | 67 | {"SKU capabilities", IWM_EEPROM_SKU_CAP_OFF, IWM_EEPROM_SKU_CAP_LEN}, |
68 | 68 | ||
69 | [IWM_EEPROM_FAT_CHANNELS_CAP] = | ||
70 | {"HT channels capabilities", IWM_EEPROM_FAT_CHANNELS_CAP_OFF, | ||
71 | IWM_EEPROM_FAT_CHANNELS_CAP_LEN}, | ||
72 | |||
69 | [IWM_EEPROM_CALIB_RXIQ_OFFSET] = | 73 | [IWM_EEPROM_CALIB_RXIQ_OFFSET] = |
70 | {"RX IQ offset", IWM_EEPROM_CALIB_RXIQ_OFF, IWM_EEPROM_INDIRECT_LEN}, | 74 | {"RX IQ offset", IWM_EEPROM_CALIB_RXIQ_OFF, IWM_EEPROM_INDIRECT_LEN}, |
71 | 75 | ||
@@ -146,6 +150,32 @@ u8 *iwm_eeprom_access(struct iwm_priv *iwm, u8 eeprom_id) | |||
146 | return iwm->eeprom + eeprom_map[eeprom_id].offset; | 150 | return iwm->eeprom + eeprom_map[eeprom_id].offset; |
147 | } | 151 | } |
148 | 152 | ||
153 | int iwm_eeprom_fat_channels(struct iwm_priv *iwm) | ||
154 | { | ||
155 | struct wiphy *wiphy = iwm_to_wiphy(iwm); | ||
156 | struct ieee80211_supported_band *band; | ||
157 | u16 *channels, i; | ||
158 | |||
159 | channels = (u16 *)iwm_eeprom_access(iwm, IWM_EEPROM_FAT_CHANNELS_CAP); | ||
160 | if (IS_ERR(channels)) | ||
161 | return PTR_ERR(channels); | ||
162 | |||
163 | band = wiphy->bands[IEEE80211_BAND_2GHZ]; | ||
164 | band->ht_cap.ht_supported = true; | ||
165 | |||
166 | for (i = 0; i < IWM_EEPROM_FAT_CHANNELS_24; i++) | ||
167 | if (!(channels[i] & IWM_EEPROM_FAT_CHANNEL_ENABLED)) | ||
168 | band->ht_cap.ht_supported = false; | ||
169 | |||
170 | band = wiphy->bands[IEEE80211_BAND_5GHZ]; | ||
171 | band->ht_cap.ht_supported = true; | ||
172 | for (i = IWM_EEPROM_FAT_CHANNELS_24; i < IWM_EEPROM_FAT_CHANNELS; i++) | ||
173 | if (!(channels[i] & IWM_EEPROM_FAT_CHANNEL_ENABLED)) | ||
174 | band->ht_cap.ht_supported = false; | ||
175 | |||
176 | return 0; | ||
177 | } | ||
178 | |||
149 | int iwm_eeprom_init(struct iwm_priv *iwm) | 179 | int iwm_eeprom_init(struct iwm_priv *iwm) |
150 | { | 180 | { |
151 | int i, ret = 0; | 181 | int i, ret = 0; |