Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80b38fff authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: fix compiling error with different configuration 



When .config has different configuration, it might fail to compile
iwlwifi. fix it

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 2f115cf2

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −2
Original line number Diff line number Diff line
@@ -3771,7 +3771,7 @@ static void iwlagn_disable_roc(struct iwl_priv *priv) 


	priv->_agn.hw_roc_channel = NULL;



	iwlagn_commit_rxon(priv, ctx);

	iwlcore_commit_rxon(priv, ctx);



	ctx->is_active = false;

}
@@ -3787,6 +3787,7 @@ static void iwlagn_bg_roc_done(struct work_struct *work) 
	mutex_unlock(&priv->mutex);

}



#ifdef CONFIG_IWL5000

static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw,

				     struct ieee80211_channel *channel,

				     enum nl80211_channel_type channel_type,
@@ -3814,7 +3815,7 @@ static int iwl_mac_remain_on_channel(struct ieee80211_hw *hw, 
	priv->_agn.hw_roc_channel = channel;

	priv->_agn.hw_roc_chantype = channel_type;

	priv->_agn.hw_roc_duration = DIV_ROUND_UP(duration * 1000, 1024);

	iwlagn_commit_rxon(priv, &priv->contexts[IWL_RXON_CTX_PAN]);

	iwlcore_commit_rxon(priv, &priv->contexts[IWL_RXON_CTX_PAN]);

	queue_delayed_work(priv->workqueue, &priv->_agn.hw_roc_work,

			   msecs_to_jiffies(duration + 20));
@@ -3842,6 +3843,7 @@ static int iwl_mac_cancel_remain_on_channel(struct ieee80211_hw *hw) 


	return 0;

}

#endif



/*****************************************************************************

 *