diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-09 15:00:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-09 15:00:06 -0400 |
| commit | 3b924ea1ac55caca853992b425a56513d74d67dc (patch) | |
| tree | d3d48369b31e829820c7268cd5bf393fbe2dae8f /drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | |
| parent | ab09b95cbfecc3c9dd45268176f6fd13beb75bcb (diff) | |
| parent | 2cddddc56a1179aa71b460ad616176c237d4a243 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c index 018af2957d3..354255f0875 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c @@ -146,8 +146,6 @@ static const u8 iwl_nvm_channels_family_8000[] = { #define LAST_2GHZ_HT_PLUS 9 #define LAST_5GHZ_HT 161 -#define DEFAULT_MAX_TX_POWER 16 - /* rate data (static) */ static struct ieee80211_rate iwl_cfg80211_rates[] = { { .bitrate = 1 * 10, .hw_value = 0, .hw_value_short = 0, }, @@ -295,7 +293,7 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, * Default value - highest tx power value. max_power * is not used in mvm, and is used for backwards compatibility */ - channel->max_power = DEFAULT_MAX_TX_POWER; + channel->max_power = IWL_DEFAULT_MAX_TX_POWER; is_5ghz = channel->band == IEEE80211_BAND_5GHZ; IWL_DEBUG_EEPROM(dev, "Ch. %d [%sGHz] %s%s%s%s%s%s%s(0x%02x %ddBm): Ad-Hoc %ssupported\n", |