1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index fcfb410aca90..baaf48616cc7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2770,15 +2770,6 @@ static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw,
 
         mutex_lock(&priv->shrd->mutex);
 
-        /*
-         * TODO: Remove this hack! Firmware needs to be updated
-         * to allow longer off-channel periods in scanning for
-         * this use case, based on a flag (and we'll need an API
-         * flag in the firmware when it has that).
-         */
-        if (iwl_is_associated(priv, IWL_RXON_CTX_BSS) && duration > 80)
-                duration = 80;
-
         if (test_bit(STATUS_SCAN_HW, &priv->shrd->status)) {
                 err = -EBUSY;
                 goto out;
@@ -2787,6 +2778,7 @@ static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw,
         priv->hw_roc_channel = channel;
         priv->hw_roc_chantype = channel_type;
         priv->hw_roc_duration = duration;
+        priv->hw_roc_start_notified = false;
         cancel_delayed_work(&priv->hw_roc_disable_work);
 
         if (!ctx->is_active) {