Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8622e705 authored by Assaf Krauss's avatar Assaf Krauss Committed by John W. Linville
Browse files

iwlwifi: rename iwl4965_get_channel_info to iwl_get_channel_info 



iwl4965_get_channel_info was moved to iwlcore module
4965 needs to be stripped off

Signed-off-by: default avatarAssaf Krauss <assaf.krauss@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 410e088d

drivers/net/wireless/iwlwifi/iwl-4965.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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);
@@ -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;

drivers/net/wireless/iwlwifi/iwl-4965.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/iwlwifi/iwl-eeprom.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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)

{
@@ -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);

drivers/net/wireless/iwlwifi/iwl-eeprom.h

+1 −1
Original line number Diff line number Diff line
@@ -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);