1 files changed, 34 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 6d140bd5329..6c2adc58d65 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -52,10 +52,14 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
                               struct iwl_rxon_context *ctx,
                               struct iwl_rxon_cmd *send)
 {
+        struct iwl_notification_wait disable_wait;
         __le32 old_filter = send->filter_flags;
         u8 old_dev_type = send->dev_type;
         int ret;
 
+        iwlagn_init_notification_wait(priv, &disable_wait, NULL,
+                                      REPLY_WIPAN_DEACTIVATION_COMPLETE);
+
         send->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
         send->dev_type = RXON_DEV_TYPE_P2P;
         ret = iwl_send_cmd_pdu(priv, ctx->rxon_cmd, sizeof(*send), send);
@@ -63,11 +67,18 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
         send->filter_flags = old_filter;
         send->dev_type = old_dev_type;
 
-        if (ret)
+        if (ret) {
                 IWL_ERR(priv, "Error disabling PAN (%d)\n", ret);
-
-        /* FIXME: WAIT FOR PAN DISABLE */
-        msleep(300);
+                iwlagn_remove_notification(priv, &disable_wait);
+        } else {
+                signed long wait_res;
+
+                wait_res = iwlagn_wait_notification(priv, &disable_wait, HZ);
+                if (wait_res == 0) {
+                        IWL_ERR(priv, "Timed out waiting for PAN disable\n");
+                        ret = -EIO;
+                }
+        }
 
         return ret;
 }
@@ -145,6 +156,23 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         /* always get timestamp with Rx frame */
         ctx->staging.flags |= RXON_FLG_TSF2HOST_MSK;
 
+        if (ctx->ctxid == IWL_RXON_CTX_PAN && priv->_agn.hw_roc_channel) {
+                struct ieee80211_channel *chan = priv->_agn.hw_roc_channel;
+
+                iwl_set_rxon_channel(priv, chan, ctx);
+                iwl_set_flags_for_band(priv, ctx, chan->band, NULL);
+                ctx->staging.filter_flags |=
+                        RXON_FILTER_ASSOC_MSK |
+                        RXON_FILTER_PROMISC_MSK |
+                        RXON_FILTER_CTL2HOST_MSK;
+                ctx->staging.dev_type = RXON_DEV_TYPE_P2P;
+                new_assoc = true;
+
+                if (memcmp(&ctx->staging, &ctx->active,
+                           sizeof(ctx->staging)) == 0)
+                        return 0;
+        }
+
         if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||
             !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))
                 ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -288,10 +316,9 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
          * If we issue a new RXON command which required a tune then we must
          * send a new TXPOWER command or we won't be able to Tx any frames.
          *
-         * FIXME: which RXON requires a tune? Can we optimise this out in
-         *        some cases?
+         * It's expected we set power here if channel is changing.
          */
-        ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
+        ret = iwl_set_tx_power(priv, priv->tx_power_next, true);
         if (ret) {
                 IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
                 return ret;
@@ -546,12 +573,10 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
 
         if (changes & BSS_CHANGED_ASSOC) {
                 if (bss_conf->assoc) {
-                        iwl_led_associate(priv);
                         priv->timestamp = bss_conf->timestamp;
                         ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;
                 } else {
                         ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
-                        iwl_led_disassociate(priv);
                 }
         }