Commit 3edb5fd6 authored by Shanyu Zhao's avatar Shanyu Zhao Committed by John W. Linville

iwlwifi: cleanup iwl_set_rxon_channel()

Update outdated comments of iwl_set_rxon_channel() to reflect the
current signature. Also remove the unnecessary validation of the
channel. Those channel info are constructed in iwlwifi driver
and mac80211 will never modify the content of the struct. Also
everytime before this function is called the channel info has
been validated already (as a paranoid check).
Signed-off-by: default avatarShanyu Zhao <shanyu.zhao@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent aa2dc6b5
...@@ -904,26 +904,19 @@ u8 iwl_get_single_channel_number(struct iwl_priv *priv, ...@@ -904,26 +904,19 @@ u8 iwl_get_single_channel_number(struct iwl_priv *priv,
EXPORT_SYMBOL(iwl_get_single_channel_number); EXPORT_SYMBOL(iwl_get_single_channel_number);
/** /**
* iwl_set_rxon_channel - Set the phymode and channel values in staging RXON * iwl_set_rxon_channel - Set the band and channel values in staging RXON
* @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz * @ch: requested channel as a pointer to struct ieee80211_channel
* @channel: Any channel valid for the requested phymode
* In addition to setting the staging RXON, priv->phymode is also set. * In addition to setting the staging RXON, priv->band is also set.
* *
* NOTE: Does not commit to the hardware; it sets appropriate bit fields * NOTE: Does not commit to the hardware; it sets appropriate bit fields
* in the staging RXON flag structure based on the phymode * in the staging RXON flag structure based on the ch->band
*/ */
int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch) int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch)
{ {
enum ieee80211_band band = ch->band; enum ieee80211_band band = ch->band;
u16 channel = ch->hw_value; u16 channel = ch->hw_value;
if (!iwl_get_channel_info(priv, band, channel)) {
IWL_DEBUG_INFO(priv, "Could not set channel to %d [%d]\n",
channel, band);
return -EINVAL;
}
if ((le16_to_cpu(priv->staging_rxon.channel) == channel) && if ((le16_to_cpu(priv->staging_rxon.channel) == channel) &&
(priv->band == band)) (priv->band == band))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment