diff options
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/dvm/rxon.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c index 2d47cb24c48b..b228552184b5 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c +++ b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | |||
@@ -719,7 +719,7 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf) | |||
719 | void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | 719 | void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, |
720 | struct iwl_rxon_context *ctx) | 720 | struct iwl_rxon_context *ctx) |
721 | { | 721 | { |
722 | enum ieee80211_band band = ch->band; | 722 | enum nl80211_band band = ch->band; |
723 | u16 channel = ch->hw_value; | 723 | u16 channel = ch->hw_value; |
724 | 724 | ||
725 | if ((le16_to_cpu(ctx->staging.channel) == channel) && | 725 | if ((le16_to_cpu(ctx->staging.channel) == channel) && |
@@ -727,7 +727,7 @@ void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | |||
727 | return; | 727 | return; |
728 | 728 | ||
729 | ctx->staging.channel = cpu_to_le16(channel); | 729 | ctx->staging.channel = cpu_to_le16(channel); |
730 | if (band == IEEE80211_BAND_5GHZ) | 730 | if (band == NL80211_BAND_5GHZ) |
731 | ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK; | 731 | ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK; |
732 | else | 732 | else |
733 | ctx->staging.flags |= RXON_FLG_BAND_24G_MSK; | 733 | ctx->staging.flags |= RXON_FLG_BAND_24G_MSK; |
@@ -740,10 +740,10 @@ void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, | |||
740 | 740 | ||
741 | void iwl_set_flags_for_band(struct iwl_priv *priv, | 741 | void iwl_set_flags_for_band(struct iwl_priv *priv, |
742 | struct iwl_rxon_context *ctx, | 742 | struct iwl_rxon_context *ctx, |
743 | enum ieee80211_band band, | 743 | enum nl80211_band band, |
744 | struct ieee80211_vif *vif) | 744 | struct ieee80211_vif *vif) |
745 | { | 745 | { |
746 | if (band == IEEE80211_BAND_5GHZ) { | 746 | if (band == NL80211_BAND_5GHZ) { |
747 | ctx->staging.flags &= | 747 | ctx->staging.flags &= |
748 | ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK | 748 | ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK |
749 | | RXON_FLG_CCK_MSK); | 749 | | RXON_FLG_CCK_MSK); |
@@ -1476,7 +1476,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, | |||
1476 | 1476 | ||
1477 | iwlagn_set_rxon_chain(priv, ctx); | 1477 | iwlagn_set_rxon_chain(priv, ctx); |
1478 | 1478 | ||
1479 | if (bss_conf->use_cts_prot && (priv->band != IEEE80211_BAND_5GHZ)) | 1479 | if (bss_conf->use_cts_prot && (priv->band != NL80211_BAND_5GHZ)) |
1480 | ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK; | 1480 | ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK; |
1481 | else | 1481 | else |
1482 | ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK; | 1482 | ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK; |