Skip to content

Commit

Permalink
iwlwifi: rename iwl4965_get_channel_info to iwl_get_channel_info
Browse files Browse the repository at this point in the history 
iwl4965_get_channel_info was moved to iwlcore module
4965 needs to be stripped off

Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Assaf Krauss authored and John W. Linville committed Mar 25, 2008
1 parent 410e088 commit 8622e70
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/iwlwifi/iwl-4965.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,7 @@ iwl4965_get_channel_txpower_info(struct iwl_priv *priv,
{
const struct iwl_channel_info *ch_info;

ch_info = iwl4965_get_channel_info(priv, band, channel);
ch_info = iwl_get_channel_info(priv, band, channel);

if (!is_channel_valid(ch_info))
return NULL;
Expand Down Expand Up @@ -2764,7 +2764,7 @@ int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel)

band = priv->band == IEEE80211_BAND_2GHZ;

ch_info = iwl4965_get_channel_info(priv, priv->band, channel);
ch_info = iwl_get_channel_info(priv, priv->band, channel);

is_fat = is_fat_channel(priv->staging_rxon.flags);

Expand Down Expand Up @@ -4574,7 +4574,7 @@ static u8 iwl4965_is_channel_extension(struct iwl_priv *priv,
{
const struct iwl_channel_info *ch_info;

ch_info = iwl4965_get_channel_info(priv, band, channel);
ch_info = iwl_get_channel_info(priv, band, channel);
if (!is_channel_valid(ch_info))
return 0;

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-4965.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ static inline int is_channel_ibss(const struct iwl_channel_info *ch)
return ((ch->flags & EEPROM_CHANNEL_IBSS)) ? 1 : 0;
}

extern const struct iwl_channel_info *iwl4965_get_channel_info(
extern const struct iwl_channel_info *iwl_get_channel_info(
const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);

/* Requires full declaration of iwl_priv before including */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ int iwlcore_set_rxon_channel(struct iwl_priv *priv,
enum ieee80211_band band,
u16 channel)
{
if (!iwl4965_get_channel_info(priv, band, channel)) {
if (!iwl_get_channel_info(priv, band, channel)) {
IWL_DEBUG_INFO("Could not set channel to %d [%d]\n",
channel, band);
return -EINVAL;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/iwlwifi/iwl-eeprom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ static int iwl4965_set_fat_chan_info(struct iwl_priv *priv,
struct iwl_channel_info *ch_info;

ch_info = (struct iwl_channel_info *)
iwl4965_get_channel_info(priv, band, channel);
iwl_get_channel_info(priv, band, channel);

if (!is_channel_valid(ch_info))
return -1;
Expand Down Expand Up @@ -534,7 +534,7 @@ EXPORT_SYMBOL(iwl_free_channel_map);
*
* Based on band and channel number.
*/
const struct iwl_channel_info *iwl4965_get_channel_info(
const struct iwl_channel_info *iwl_get_channel_info(
const struct iwl_priv *priv,
enum ieee80211_band band, u16 channel)
{
Expand All @@ -557,5 +557,5 @@ const struct iwl_channel_info *iwl4965_get_channel_info(

return NULL;
}
EXPORT_SYMBOL(iwl4965_get_channel_info);
EXPORT_SYMBOL(iwl_get_channel_info);

2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-eeprom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv);

int iwl_init_channel_map(struct iwl_priv *priv);
void iwl_free_channel_map(struct iwl_priv *priv);
const struct iwl_channel_info *iwl4965_get_channel_info(
const struct iwl_channel_info *iwl_get_channel_info(
const struct iwl_priv *priv,
enum ieee80211_band band, u16 channel);

Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/iwlwifi/iwl4965-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2271,7 +2271,7 @@ static void iwl4965_connection_init_rx_config(struct iwl_priv *priv)
priv->staging_rxon.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
#endif

ch_info = iwl4965_get_channel_info(priv, priv->band,
ch_info = iwl_get_channel_info(priv, priv->band,
le16_to_cpu(priv->staging_rxon.channel));

if (!ch_info)
Expand Down Expand Up @@ -2309,7 +2309,7 @@ static int iwl4965_set_mode(struct iwl_priv *priv, int mode)
if (mode == IEEE80211_IF_TYPE_IBSS) {
const struct iwl_channel_info *ch_info;

ch_info = iwl4965_get_channel_info(priv,
ch_info = iwl_get_channel_info(priv,
priv->band,
le16_to_cpu(priv->staging_rxon.channel));

Expand Down Expand Up @@ -5021,7 +5021,7 @@ static int iwl4965_get_channels_for_scan(struct iwl_priv *priv,

scan_ch->channel = ieee80211_frequency_to_channel(channels[i].center_freq);

ch_info = iwl4965_get_channel_info(priv, band,
ch_info = iwl_get_channel_info(priv, band,
scan_ch->channel);
if (!is_channel_valid(ch_info)) {
IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n",
Expand Down Expand Up @@ -6823,7 +6823,7 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co

spin_lock_irqsave(&priv->lock, flags);

ch_info = iwl4965_get_channel_info(priv, conf->channel->band,
ch_info = iwl_get_channel_info(priv, conf->channel->band,
ieee80211_frequency_to_channel(conf->channel->center_freq));
if (!is_channel_valid(ch_info)) {
IWL_DEBUG_MAC80211("leave - invalid channel\n");
Expand Down

0 comments on commit 8622e70

Please sign in to comment.