aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-01-24 08:14:22 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-01-30 15:41:32 -0500
commitb1e1adfa7d30cd0e8ad9a5c6a89e8c45ebe084f4 (patch)
tree43b0ae0d3e4b6ffbfd31d652a2b982e9956cb373 /drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
parentaa2b17708380ca48946a9ad97907f54032cf48fc (diff)
iwlwifi: add NVM and PHY DB code for new MVM driver
The new MVM (multi-virtual MAC) firmware driver requires NVM (non-volatile memory) parsing code and some PHY information database code. Add this separately. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index 1ece4c06e45c..034f2ff4f43d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -703,9 +703,9 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg,
703 return n_channels; 703 return n_channels;
704} 704}
705 705
706static int iwl_init_sband_channels(struct iwl_nvm_data *data, 706int iwl_init_sband_channels(struct iwl_nvm_data *data,
707 struct ieee80211_supported_band *sband, 707 struct ieee80211_supported_band *sband,
708 int n_channels, enum ieee80211_band band) 708 int n_channels, enum ieee80211_band band)
709{ 709{
710 struct ieee80211_channel *chan = &data->channels[0]; 710 struct ieee80211_channel *chan = &data->channels[0];
711 int n = 0, idx = 0; 711 int n = 0, idx = 0;
@@ -728,10 +728,10 @@ static int iwl_init_sband_channels(struct iwl_nvm_data *data,
728#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */ 728#define MAX_BIT_RATE_40_MHZ 150 /* Mbps */
729#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */ 729#define MAX_BIT_RATE_20_MHZ 72 /* Mbps */
730 730
731static void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, 731void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg,
732 struct iwl_nvm_data *data, 732 struct iwl_nvm_data *data,
733 struct ieee80211_sta_ht_cap *ht_info, 733 struct ieee80211_sta_ht_cap *ht_info,
734 enum ieee80211_band band) 734 enum ieee80211_band band)
735{ 735{
736 int max_bit_rate = 0; 736 int max_bit_rate = 0;
737 u8 rx_chains; 737 u8 rx_chains;