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

Commit 5b9f8cd3 authored Oct 29, 2008 by Emmanuel Grumbach Committed by John W. Linville Nov 10, 2008

iwlwifi: rename generic iwlagn functions that had a HW specific name



This patch renames functions that are generic in iwl-agn and had a iwl4965
prefix.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-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>

parent 60294de3

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2323,7 +2323,7 @@ static struct iwl_lib_ops iwl4965_lib = {
	.reset = iwl4965_apm_reset,		.reset = iwl4965_apm_reset,
	.stop = iwl4965_apm_stop,		.stop = iwl4965_apm_stop,
	.config = iwl4965_nic_config,		.config = iwl4965_nic_config,
	.set_pwr_src = iwl4965_set_pwr_src,		.set_pwr_src = iwl_set_pwr_src,
	},		},
	.eeprom_ops = {		.eeprom_ops = {
	.regulatory_bands = {		.regulatory_bands = {
	@@ -2342,7 +2342,7 @@ static struct iwl_lib_ops iwl4965_lib = {
	.query_addr = iwlcore_eeprom_query_addr,		.query_addr = iwlcore_eeprom_query_addr,
	},		},
	.send_tx_power = iwl4965_send_tx_power,		.send_tx_power = iwl4965_send_tx_power,
	.update_chain_flags = iwl4965_update_chain_flags,		.update_chain_flags = iwl_update_chain_flags,
	.temperature = iwl4965_temperature_calib,		.temperature = iwl4965_temperature_calib,
	};		};

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1474,13 +1474,13 @@ static struct iwl_lib_ops iwl5000_lib = {
	.alive_notify = iwl5000_alive_notify,		.alive_notify = iwl5000_alive_notify,
	.send_tx_power = iwl5000_send_tx_power,		.send_tx_power = iwl5000_send_tx_power,
	.temperature = iwl5000_temperature,		.temperature = iwl5000_temperature,
	.update_chain_flags = iwl4965_update_chain_flags,		.update_chain_flags = iwl_update_chain_flags,
	.apm_ops = {		.apm_ops = {
	.init = iwl5000_apm_init,		.init = iwl5000_apm_init,
	.reset = iwl5000_apm_reset,		.reset = iwl5000_apm_reset,
	.stop = iwl5000_apm_stop,		.stop = iwl5000_apm_stop,
	.config = iwl5000_nic_config,		.config = iwl5000_nic_config,
	.set_pwr_src = iwl4965_set_pwr_src,		.set_pwr_src = iwl_set_pwr_src,
	},		},
	.eeprom_ops = {		.eeprom_ops = {
	.regulatory_bands = {		.regulatory_bands = {

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

+201 −201

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -576,8 +576,8 @@ extern int iwl_send_add_sta(struct iwl_priv *priv,
	struct iwl_addsta_cmd *sta, u8 flags);		struct iwl_addsta_cmd *sta, u8 flags);
	extern u8 iwl_add_station_flags(struct iwl_priv priv, const u8 addr,		extern u8 iwl_add_station_flags(struct iwl_priv priv, const u8 addr,
	int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);		int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);
	extern void iwl4965_update_chain_flags(struct iwl_priv *priv);		extern void iwl_update_chain_flags(struct iwl_priv *priv);
	extern int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);		extern int iwl_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);
	extern const u8 iwl_bcast_addr[ETH_ALEN];		extern const u8 iwl_bcast_addr[ETH_ALEN];
	extern int iwl_rxq_stop(struct iwl_priv *priv);		extern int iwl_rxq_stop(struct iwl_priv *priv);
	extern void iwl_txq_ctx_stop(struct iwl_priv *priv);		extern void iwl_txq_ctx_stop(struct iwl_priv *priv);