|
@@ -904,26 +904,19 @@ u8 iwl_get_single_channel_number(struct iwl_priv *priv,
|
|
|
EXPORT_SYMBOL(iwl_get_single_channel_number);
|
|
|
|
|
|
/**
|
|
|
- * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON
|
|
|
- * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
|
|
|
- * @channel: Any channel valid for the requested phymode
|
|
|
+ * iwl_set_rxon_channel - Set the band and channel values in staging RXON
|
|
|
+ * @ch: requested channel as a pointer to struct ieee80211_channel
|
|
|
|
|
|
- * 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
|
|
|
- * 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)
|
|
|
{
|
|
|
enum ieee80211_band band = ch->band;
|
|
|
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) &&
|
|
|
(priv->band == band))
|
|
|
return 0;
|