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

Commit dc1b0973 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: name changes from "tx_power_channel_lmt" to "tx_power_device_lmt" 



Changing the name from "tx_power_channel_lmt" to "tx_power_device_lmt";
to give idea that scope of limit is for overall device, not any
individual channels

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 08f2d58d

drivers/net/wireless/iwlwifi/iwl-core.c

+4 −4
Original line number Diff line number Diff line
@@ -543,8 +543,8 @@ int iwlcore_init_geos(struct iwl_priv *priv) 


			geo_ch->flags |= ch->ht40_extension_channel;



			if (ch->max_power_avg > priv->tx_power_channel_lmt)

				priv->tx_power_channel_lmt = ch->max_power_avg;

			if (ch->max_power_avg > priv->tx_power_device_lmt)

				priv->tx_power_device_lmt = ch->max_power_avg;

		} else {

			geo_ch->flags |= IEEE80211_CHAN_DISABLED;

		}
@@ -1708,10 +1708,10 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) 
		return -EINVAL;

	}



	if (tx_power > priv->tx_power_channel_lmt) {

	if (tx_power > priv->tx_power_device_lmt) {

		IWL_WARN(priv,

			"Requested user TXPOWER %d above upper limit %d.\n",

			 tx_power, priv->tx_power_channel_lmt);

			 tx_power, priv->tx_power_device_lmt);

		return -EINVAL;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ struct iwl_priv { 


	/* TX Power */

	s8 tx_power_user_lmt;

	s8 tx_power_channel_lmt;

	s8 tx_power_device_lmt;





#ifdef CONFIG_IWLWIFI_DEBUG