1 files changed, 63 insertions, 24 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 885167f8168d..4653deada05b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -41,6 +41,7 @@
 #include "iwl-power.h"
 #include "iwl-sta.h"
 #include "iwl-helpers.h"
+#include "iwl-agn.h"
 
 
 /*
@@ -94,7 +95,7 @@ static void iwlcore_init_ht_hw_capab(const struct iwl_priv *priv,
                 max_bit_rate = MAX_BIT_RATE_40_MHZ;
         }
 
-        if (priv->cfg->mod_params->amsdu_size_8K)
+        if (iwlagn_mod_params.amsdu_size_8K)
                 ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU;
 
         ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
@@ -135,6 +136,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
         struct ieee80211_channel *geo_ch;
         struct ieee80211_rate *rates;
         int i = 0;
+        s8 max_tx_power = IWLAGN_TX_POWER_TARGET_POWER_MIN;
 
         if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
             priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
@@ -208,8 +210,8 @@ int iwlcore_init_geos(struct iwl_priv *priv)
 
                         geo_ch->flags |= ch->ht40_extension_channel;
 
-                        if (ch->max_power_avg > priv->tx_power_device_lmt)
-                                priv->tx_power_device_lmt = ch->max_power_avg;
+                        if (ch->max_power_avg > max_tx_power)
+                                max_tx_power = ch->max_power_avg;
                 } else {
                         geo_ch->flags |= IEEE80211_CHAN_DISABLED;
                 }
@@ -222,6 +224,10 @@ int iwlcore_init_geos(struct iwl_priv *priv)
                                  geo_ch->flags);
         }
 
+        priv->tx_power_device_lmt = max_tx_power;
+        priv->tx_power_user_lmt = max_tx_power;
+        priv->tx_power_next = max_tx_power;
+
         if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
              priv->cfg->sku & IWL_SKU_A) {
                 IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
@@ -410,72 +416,72 @@ void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
 int iwl_check_rxon_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 {
         struct iwl_rxon_cmd *rxon = &ctx->staging;
-        bool error = false;
+        u32 errors = 0;
 
         if (rxon->flags & RXON_FLG_BAND_24G_MSK) {
                 if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {
                         IWL_WARN(priv, "check 2.4G: wrong narrow\n");
-                        error = true;
+                        errors |= BIT(0);
                 }
                 if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {
                         IWL_WARN(priv, "check 2.4G: wrong radar\n");
-                        error = true;
+                        errors |= BIT(1);
                 }
         } else {
                 if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {
                         IWL_WARN(priv, "check 5.2G: not short slot!\n");
-                        error = true;
+                        errors |= BIT(2);
                 }
                 if (rxon->flags & RXON_FLG_CCK_MSK) {
                         IWL_WARN(priv, "check 5.2G: CCK!\n");
-                        error = true;
+                        errors |= BIT(3);
                 }
         }
         if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {
                 IWL_WARN(priv, "mac/bssid mcast!\n");
-                error = true;
+                errors |= BIT(4);
         }
 
         /* make sure basic rates 6Mbps and 1Mbps are supported */
         if ((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0 &&
             (rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0) {
                 IWL_WARN(priv, "neither 1 nor 6 are basic\n");
-                error = true;
+                errors |= BIT(5);
         }
 
         if (le16_to_cpu(rxon->assoc_id) > 2007) {
                 IWL_WARN(priv, "aid > 2007\n");
-                error = true;
+                errors |= BIT(6);
         }
 
         if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))
                         == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {
                 IWL_WARN(priv, "CCK and short slot\n");
-                error = true;
+                errors |= BIT(7);
         }
 
         if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))
                         == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {
                 IWL_WARN(priv, "CCK and auto detect");
-                error = true;
+                errors |= BIT(8);
         }
 
         if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |
                             RXON_FLG_TGG_PROTECT_MSK)) ==
                             RXON_FLG_TGG_PROTECT_MSK) {
                 IWL_WARN(priv, "TGg but no auto-detect\n");
-                error = true;
+                errors |= BIT(9);
         }
 
-        if (error)
-                IWL_WARN(priv, "Tuning to channel %d\n",
-                            le16_to_cpu(rxon->channel));
-
-        if (error) {
-                IWL_ERR(priv, "Invalid RXON\n");
-                return -EINVAL;
+        if (rxon->channel == 0) {
+                IWL_WARN(priv, "zero channel is invalid\n");
+                errors |= BIT(10);
         }
-        return 0;
+
+        WARN(errors, "Invalid RXON (%#x), channel %d",
+             errors, le16_to_cpu(rxon->channel));
+
+        return errors ? -EINVAL : 0;
 }
 
 /**
@@ -867,6 +873,19 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv,
 }
 #endif
 
+static void iwlagn_abort_notification_waits(struct iwl_priv *priv)
+{
+        unsigned long flags;
+        struct iwl_notification_wait *wait_entry;
+
+        spin_lock_irqsave(&priv->_agn.notif_wait_lock, flags);
+        list_for_each_entry(wait_entry, &priv->_agn.notif_waits, list)
+                wait_entry->aborted = true;
+        spin_unlock_irqrestore(&priv->_agn.notif_wait_lock, flags);
+
+        wake_up_all(&priv->_agn.notif_waitq);
+}
+
 void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
 {
         unsigned int reload_msec;
@@ -878,6 +897,8 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
         /* Cancel currently queued command. */
         clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
 
+        iwlagn_abort_notification_waits(priv);
+
         /* Keep the restart process from trying to send host
          * commands by clearing the ready bit */
         clear_bit(STATUS_READY, &priv->status);
@@ -906,7 +927,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)
         }
 
         if (!test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-                if (priv->cfg->mod_params->restart_fw) {
+                if (iwlagn_mod_params.restart_fw) {
                         IWL_DEBUG(priv, IWL_DL_FW_ERRORS,
                                   "Restarting adapter due to uCode error.\n");
                         queue_work(priv->workqueue, &priv->restart);
@@ -975,6 +996,8 @@ void iwl_apm_stop(struct iwl_priv *priv)
 {
         IWL_DEBUG_INFO(priv, "Stop card, put in low power state\n");
 
+        clear_bit(STATUS_DEVICE_ENABLED, &priv->status);
+
         /* Stop device's DMA activity */
         iwl_apm_stop_master(priv);
 
@@ -1089,6 +1112,8 @@ int iwl_apm_init(struct iwl_priv *priv)
         iwl_set_bits_prph(priv, APMG_PCIDEV_STT_REG,
                           APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
 
+        set_bit(STATUS_DEVICE_ENABLED, &priv->status);
+
 out:
         return ret;
 }
@@ -1723,7 +1748,7 @@ int iwl_force_reset(struct iwl_priv *priv, int mode, bool external)
                  * detect failure), then fw_restart module parameter
                  * need to be check before performing firmware reload
                  */
-                if (!external && !priv->cfg->mod_params->restart_fw) {
+                if (!external && !iwlagn_mod_params.restart_fw) {
                         IWL_DEBUG_INFO(priv, "Cancel firmware reload based on "
                                        "module parameter setting\n");
                         break;
@@ -1740,6 +1765,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 {
         struct iwl_priv *priv = hw->priv;
         struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
+        struct iwl_rxon_context *bss_ctx = &priv->contexts[IWL_RXON_CTX_BSS];
         struct iwl_rxon_context *tmp;
         u32 interface_modes;
         int err;
@@ -1764,6 +1790,19 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                 goto out;
         }
 
+        /*
+         * Refuse a change that should be done by moving from the PAN
+         * context to the BSS context instead, if the BSS context is
+         * available and can support the new interface type.
+         */
+        if (ctx->ctxid == IWL_RXON_CTX_PAN && !bss_ctx->vif &&
+            (bss_ctx->interface_modes & BIT(newtype) ||
+             bss_ctx->exclusive_interface_modes & BIT(newtype))) {
+                BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
+                err = -EBUSY;
+                goto out;
+        }
+
         if (ctx->exclusive_interface_modes & BIT(newtype)) {
                 for_each_context(priv, tmp) {
                         if (ctx == tmp)