1 files changed, 3 insertions, 19 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 7f16d1203057..f91e306c2498 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -585,8 +585,7 @@ static void _iwl_set_rxon_ht(struct iwl_priv *priv,
                 rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;
         }
 
-        if (priv->cfg->ops->hcmd->set_rxon_chain)
-                priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
+        iwlagn_set_rxon_chain(priv, ctx);
 
         IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "
                         "extension channel offset 0x%x\n",
@@ -1216,8 +1215,7 @@ static int iwl_set_mode(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 {
         iwl_connection_init_rx_config(priv, ctx);
 
-        if (priv->cfg->ops->hcmd->set_rxon_chain)
-                priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
+        iwlagn_set_rxon_chain(priv, ctx);
 
         return iwlagn_commit_rxon(priv, ctx);
 }
@@ -1372,20 +1370,6 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw,
 
 }
 
-int iwl_alloc_txq_mem(struct iwl_priv *priv)
-{
-        if (!priv->txq)
-                priv->txq = kzalloc(
-                        sizeof(struct iwl_tx_queue) *
-                                priv->cfg->base_params->num_of_queues,
-                        GFP_KERNEL);
-        if (!priv->txq) {
-                IWL_ERR(priv, "Not enough memory for txq\n");
-                return -ENOMEM;
-        }
-        return 0;
-}
-
 void iwl_free_txq_mem(struct iwl_priv *priv)
 {
         kfree(priv->txq);
@@ -1853,7 +1837,7 @@ void iwl_setup_watchdog(struct iwl_priv *priv)
 {
         unsigned int timeout = priv->cfg->base_params->wd_timeout;
 
-        if (timeout)
+        if (timeout && !iwlagn_mod_params.wd_disable)
                 mod_timer(&priv->watchdog,
                           jiffies + msecs_to_jiffies(IWL_WD_TICK(timeout)));
         else