iwlwifi: remove unused or twice defined members in iwl_priv

This patch removes user_txpower_limit and max_channel_txpower_limit
and use tx_power_user_lmt and tx_power_channel_lmt instead
call_post_assoc_from_beacon is not used

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 1f3305b36d05..fe907f353368 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -1675,7 +1675,7 @@ static void iwl3945_hw_reg_set_scan_power(struct iwl_priv *priv, u32 scan_tbl_in
         /* further limit to user's max power preference.
          * FIXME:  Other spectrum management power limitations do not
          *   seem to apply?? */
-        power = min(power, priv->user_txpower_limit);
+        power = min(power, priv->tx_power_user_lmt);
         scan_power_info->requested_power = power;
 
         /* find difference between new scan *power* and current "normal"
@@ -1947,14 +1947,14 @@ int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power)
         u8 a_band;
         u8 i;
 
-        if (priv->user_txpower_limit == power) {
+        if (priv->tx_power_user_lmt == power) {
                 IWL_DEBUG_POWER("Requested Tx power same as current "
                                 "limit: %ddBm.\n", power);
                 return 0;
         }
 
         IWL_DEBUG_POWER("Setting upper limit clamp to %ddBm.\n", power);
-        priv->user_txpower_limit = power;
+        priv->tx_power_user_lmt = power;
 
         /* set up new Tx powers for each and every channel, 2.4 and 5.x */