Skip to content

Commit

Permalink
iwlwifi: use mac80211 channel in connection init
Browse files Browse the repository at this point in the history
mac80211 guarantees that the channel pointer is
always valid, so we can use that instead of our
own channel list.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jun 6, 2012
1 parent aca8626 commit 7ad580c
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
void iwl_connection_init_rx_config(struct iwl_priv *priv,
struct iwl_rxon_context *ctx)
{
const struct iwl_channel_info *ch_info;

memset(&ctx->staging, 0, sizeof(ctx->staging));

if (!ctx->vif) {
Expand Down Expand Up @@ -80,14 +78,8 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv,
ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
#endif

ch_info = iwl_get_channel_info(priv, priv->band,
le16_to_cpu(ctx->active.channel));

if (!ch_info)
ch_info = &priv->channel_info[0];

ctx->staging.channel = cpu_to_le16(ch_info->channel);
priv->band = ch_info->band;
ctx->staging.channel = cpu_to_le16(priv->hw->conf.channel->hw_value);
priv->band = priv->hw->conf.channel->band;

iwl_set_flags_for_band(priv, ctx, priv->band, ctx->vif);

Expand Down

0 comments on commit 7ad580c

Please sign in to comment.