diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-04-03 19:05:22 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-08 16:44:42 -0400 |
commit | dc92e49729142047bce8f14762accb322962b585 (patch) | |
tree | 0e85ec00dfbd1045e8a02865a1ed3b79ab7ce84f /drivers/net/wireless/iwlwifi/iwl-3945.c | |
parent | fee1247a30e5b3d48fe985b4a935eb6818f3b464 (diff) |
iwlwifi: use ieee80211_frequency_to_channel
This patch replaces ieee80211chan2mhz from radiotap with
ieee80211_frequency_to_channel provided by mac80211
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 0d3cc355903..598e4eef4f4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -669,12 +669,12 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, | |||
669 | rx_status.antenna = 0; | 669 | rx_status.antenna = 0; |
670 | rx_status.flag = 0; | 670 | rx_status.flag = 0; |
671 | rx_status.mactime = le64_to_cpu(rx_end->timestamp); | 671 | rx_status.mactime = le64_to_cpu(rx_end->timestamp); |
672 | rx_status.freq = ieee80211chan2mhz(le16_to_cpu(rx_hdr->channel)); | 672 | rx_status.freq = |
673 | ieee80211_frequency_to_channel(le16_to_cpu(rx_hdr->channel)); | ||
673 | rx_status.band = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ? | 674 | rx_status.band = (rx_hdr->phy_flags & RX_RES_PHY_FLAGS_BAND_24_MSK) ? |
674 | IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ; | 675 | IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ; |
675 | 676 | ||
676 | rx_status.rate_idx = iwl3945_hwrate_to_plcp_idx(rx_hdr->rate); | 677 | rx_status.rate_idx = iwl3945_hwrate_to_plcp_idx(rx_hdr->rate); |
677 | |||
678 | if (rx_status.band == IEEE80211_BAND_5GHZ) | 678 | if (rx_status.band == IEEE80211_BAND_5GHZ) |
679 | rx_status.rate_idx -= IWL_FIRST_OFDM_RATE; | 679 | rx_status.rate_idx -= IWL_FIRST_OFDM_RATE; |
680 | 680 | ||