6 files changed, 54 insertions, 74 deletions

diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h
index 6cfbb419e2f6..0cea20e3e250 100644
--- a/drivers/net/wireless/ath/carl9170/carl9170.h
+++ b/drivers/net/wireless/ath/carl9170/carl9170.h
@@ -559,6 +559,7 @@ int carl9170_set_hwretry_limit(struct ar9170 *ar, const u32 max_retry);
 int carl9170_upload_key(struct ar9170 *ar, const u8 id, const u8 *mac,
         const u8 ktype, const u8 keyidx, const u8 *keydata, const int keylen);
 int carl9170_disable_key(struct ar9170 *ar, const u8 id);
+int carl9170_set_mac_tpc(struct ar9170 *ar, struct ieee80211_channel *channel);
 
 /* RX */
 void carl9170_rx(struct ar9170 *ar, void *buf, unsigned int len);
@@ -593,7 +594,6 @@ int carl9170_get_noisefloor(struct ar9170 *ar);
 
 /* FW */
 int carl9170_parse_firmware(struct ar9170 *ar);
-int carl9170_fw_fix_eeprom(struct ar9170 *ar);
 
 extern struct ieee80211_rate __carl9170_ratetable[];
 extern int modparam_noht;
diff --git a/drivers/net/wireless/ath/carl9170/fw.c b/drivers/net/wireless/ath/carl9170/fw.c
index 3de61adacd34..cffde8d9a521 100644
--- a/drivers/net/wireless/ath/carl9170/fw.c
+++ b/drivers/net/wireless/ath/carl9170/fw.c
@@ -389,39 +389,6 @@ carl9170_find_fw_desc(struct ar9170 *ar, const __u8 *fw_data, const size_t len)
         return (void *)&fw_data[scan - found];
 }
 
-int carl9170_fw_fix_eeprom(struct ar9170 *ar)
-{
-        const struct carl9170fw_fix_desc *fix_desc = NULL;
-        unsigned int i, n, off;
-        u32 *data = (void *)&ar->eeprom;
-
-        fix_desc = carl9170_fw_find_desc(ar, FIX_MAGIC,
-                sizeof(*fix_desc), CARL9170FW_FIX_DESC_CUR_VER);
-
-        if (!fix_desc)
-                return 0;
-
-        n = (le16_to_cpu(fix_desc->head.length) - sizeof(*fix_desc)) /
-            sizeof(struct carl9170fw_fix_entry);
-
-        for (i = 0; i < n; i++) {
-                off = le32_to_cpu(fix_desc->data[i].address) -
-                      AR9170_EEPROM_START;
-
-                if (off >= sizeof(struct ar9170_eeprom) || (off & 3)) {
-                        dev_err(&ar->udev->dev, "Skip invalid entry %d\n", i);
-                        continue;
-                }
-
-                data[off / sizeof(*data)] &=
-                        le32_to_cpu(fix_desc->data[i].mask);
-                data[off / sizeof(*data)] |=
-                        le32_to_cpu(fix_desc->data[i].value);
-        }
-
-        return 0;
-}
-
 int carl9170_parse_firmware(struct ar9170 *ar)
 {
         const struct carl9170fw_desc_head *fw_desc = NULL;
diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
index dfda91970995..53415bfd8bef 100644
--- a/drivers/net/wireless/ath/carl9170/mac.c
+++ b/drivers/net/wireless/ath/carl9170/mac.c
@@ -485,3 +485,38 @@ int carl9170_disable_key(struct ar9170 *ar, const u8 id)
         return carl9170_exec_cmd(ar, CARL9170_CMD_DKEY,
                 sizeof(key), (u8 *)&key, 0, NULL);
 }
+
+int carl9170_set_mac_tpc(struct ar9170 *ar, struct ieee80211_channel *channel)
+{
+        unsigned int power, chains;
+
+        if (ar->eeprom.tx_mask != 1)
+                chains = AR9170_TX_PHY_TXCHAIN_2;
+        else
+                chains = AR9170_TX_PHY_TXCHAIN_1;
+
+        switch (channel->band) {
+        case IEEE80211_BAND_2GHZ:
+                power = ar->power_2G_ofdm[0] & 0x3f;
+                break;
+        case IEEE80211_BAND_5GHZ:
+                power = ar->power_5G_leg[0] & 0x3f;
+                break;
+        default:
+                BUG_ON(1);
+        }
+
+        power = min_t(unsigned int, power, ar->hw->conf.power_level * 2);
+
+        carl9170_regwrite_begin(ar);
+        carl9170_regwrite(AR9170_MAC_REG_ACK_TPC,
+                          0x3c1e | power << 20 | chains << 26);
+        carl9170_regwrite(AR9170_MAC_REG_RTS_CTS_TPC,
+                          power << 5 | chains << 11 |
+                          power << 21 | chains << 27);
+        carl9170_regwrite(AR9170_MAC_REG_CFEND_QOSNULL_TPC,
+                          power << 5 | chains << 11 |
+                          power << 21 | chains << 27);
+        carl9170_regwrite_finish();
+        return carl9170_regwrite_result();
+}
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index db774212161b..8d2523b3f722 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -853,11 +853,6 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out;
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_POWER) {
-                /* TODO */
-                err = 0;
-        }
-
         if (changed & IEEE80211_CONF_CHANGE_SMPS) {
                 /* TODO */
                 err = 0;
@@ -891,6 +886,12 @@ static int carl9170_op_config(struct ieee80211_hw *hw, u32 changed)
                         goto out;
         }
 
+        if (changed & IEEE80211_CONF_CHANGE_POWER) {
+                err = carl9170_set_mac_tpc(ar, ar->hw->conf.channel);
+                if (err)
+                        goto out;
+        }
+
 out:
         mutex_unlock(&ar->mutex);
         return err;
@@ -1796,6 +1797,9 @@ void *carl9170_alloc(size_t priv_size)
                 ar->noise[i] = -95; /* ATH_DEFAULT_NOISE_FLOOR */
 
         hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+
+        /* As IBSS Encryption is software-based, IBSS RSN is supported. */
+        hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
         return ar;
 
 err_nomem:
@@ -1931,10 +1935,6 @@ int carl9170_register(struct ar9170 *ar)
         if (err)
                 return err;
 
-        err = carl9170_fw_fix_eeprom(ar);
-        if (err)
-                return err;
-
         err = carl9170_parse_eeprom(ar);
         if (err)
                 return err;
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index 472efc7e3402..b72c09cf43a4 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -1426,15 +1426,15 @@ static void carl9170_calc_ctl(struct ar9170 *ar, u32 freq, enum carl9170_bw bw)
 #undef EDGES
 }
 
-static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
-                                  enum carl9170_bw bw)
+static void carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
+                                   enum carl9170_bw bw)
 {
         struct ar9170_calibration_target_power_legacy *ctpl;
         struct ar9170_calibration_target_power_ht *ctph;
         u8 *ctpres;
         int ntargets;
         int idx, i, n;
-        u8 ackpower, ackchains, f;
+        u8 f;
         u8 pwr_freqs[AR5416_MAX_NUM_TGT_PWRS];
 
         if (freq < 3000)
@@ -1523,32 +1523,6 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
 
         /* calc. conformance test limits and apply to ar->power*[] */
         carl9170_calc_ctl(ar, freq, bw);
-
-        /* set ACK/CTS TX power */
-        carl9170_regwrite_begin(ar);
-
-        if (ar->eeprom.tx_mask != 1)
-                ackchains = AR9170_TX_PHY_TXCHAIN_2;
-        else
-                ackchains = AR9170_TX_PHY_TXCHAIN_1;
-
-        if (freq < 3000)
-                ackpower = ar->power_2G_ofdm[0] & 0x3f;
-        else
-                ackpower = ar->power_5G_leg[0] & 0x3f;
-
-        carl9170_regwrite(AR9170_MAC_REG_ACK_TPC,
-                          0x3c1e | ackpower << 20 | ackchains << 26);
-        carl9170_regwrite(AR9170_MAC_REG_RTS_CTS_TPC,
-                          ackpower << 5 | ackchains << 11 |
-                          ackpower << 21 | ackchains << 27);
-
-        carl9170_regwrite(AR9170_MAC_REG_CFEND_QOSNULL_TPC,
-                          ackpower << 5 | ackchains << 11 |
-                          ackpower << 21 | ackchains << 27);
-
-        carl9170_regwrite_finish();
-        return carl9170_regwrite_result();
 }
 
 int carl9170_get_noisefloor(struct ar9170 *ar)
@@ -1712,7 +1686,9 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
         if (err)
                 return err;
 
-        err = carl9170_set_power_cal(ar, channel->center_freq, bw);
+        carl9170_set_power_cal(ar, channel->center_freq, bw);
+
+        err = carl9170_set_mac_tpc(ar, channel);
         if (err)
                 return err;
 
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index bbc813dee983..aed305177af6 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -719,6 +719,8 @@ static void carl9170_tx_rate_tpc_chains(struct ar9170 *ar,
                 else
                         *chains = AR9170_TX_PHY_TXCHAIN_2;
         }
+
+        *tpc = min_t(unsigned int, *tpc, ar->hw->conf.power_level * 2);
 }
 
 static __le32 carl9170_tx_physet(struct ar9170 *ar,
@@ -1245,7 +1247,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
         tx_info = IEEE80211_SKB_CB(skb);
 
         if (unlikely(sta_info->sleeping) &&
-            !(tx_info->flags & (IEEE80211_TX_CTL_POLL_RESPONSE |
+            !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
                                 IEEE80211_TX_CTL_CLEAR_PS_FILT))) {
                 rcu_read_unlock();