Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d059a5 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: increase DEFAULT_MAX_TX_POWER 



The chip is able to transmit up to 22dBm, so set
the constant appropriately.

CC: <stable@vger.kernel.org> [3.13+]
Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 86974bff

drivers/net/wireless/iwlwifi/iwl-config.h

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ enum iwl_led_mode { 
#define IWL_LONG_WD_TIMEOUT	10000

#define IWL_MAX_WD_TIMEOUT	120000



#define IWL_DEFAULT_MAX_TX_POWER 22



/* Antenna presence definitions */

#define	ANT_NONE	0x0

#define	ANT_A		BIT(0)

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+1 −3
Original line number Diff line number Diff line
@@ -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",