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

Commit eb1cf0f8 authored Sep 28, 2009 by David S. Miller

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 47379052 a0d97d6c

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,8 @@ static struct iwl_lib_ops iwl1000_lib = {
	.setup_deferred_work = iwl5000_setup_deferred_work,		.setup_deferred_work = iwl5000_setup_deferred_work,
	.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,		.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
	.load_ucode = iwl5000_load_ucode,		.load_ucode = iwl5000_load_ucode,
			.dump_nic_event_log = iwl_dump_nic_event_log,
			.dump_nic_error_log = iwl_dump_nic_error_log,
	.init_alive_start = iwl5000_init_alive_start,		.init_alive_start = iwl5000_init_alive_start,
	.alive_notify = iwl5000_alive_notify,		.alive_notify = iwl5000_alive_notify,
	.send_tx_power = iwl5000_send_tx_power,		.send_tx_power = iwl5000_send_tx_power,

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2839,6 +2839,8 @@ static struct iwl_lib_ops iwl3945_lib = {
	.txq_free_tfd = iwl3945_hw_txq_free_tfd,		.txq_free_tfd = iwl3945_hw_txq_free_tfd,
	.txq_init = iwl3945_hw_tx_queue_init,		.txq_init = iwl3945_hw_tx_queue_init,
	.load_ucode = iwl3945_load_bsm,		.load_ucode = iwl3945_load_bsm,
			.dump_nic_event_log = iwl3945_dump_nic_event_log,
			.dump_nic_error_log = iwl3945_dump_nic_error_log,
	.apm_ops = {		.apm_ops = {
	.init = iwl3945_apm_init,		.init = iwl3945_apm_init,
	.reset = iwl3945_apm_reset,		.reset = iwl3945_apm_reset,

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -209,6 +209,8 @@ extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv,
	struct iwl_host_cmd *cmd);		struct iwl_host_cmd *cmd);
	extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,		extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
	struct ieee80211_hdr *hdr,int left);		struct ieee80211_hdr *hdr,int left);
			extern void iwl3945_dump_nic_event_log(struct iwl_priv *priv);
			extern void iwl3945_dump_nic_error_log(struct iwl_priv *priv);

	/*		/*
	* Currently used by iwl-3945-rs... look at restructuring so that it doesn't		* Currently used by iwl-3945-rs... look at restructuring so that it doesn't

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2298,6 +2298,8 @@ static struct iwl_lib_ops iwl4965_lib = {
	.alive_notify = iwl4965_alive_notify,		.alive_notify = iwl4965_alive_notify,
	.init_alive_start = iwl4965_init_alive_start,		.init_alive_start = iwl4965_init_alive_start,
	.load_ucode = iwl4965_load_bsm,		.load_ucode = iwl4965_load_bsm,
			.dump_nic_event_log = iwl_dump_nic_event_log,
			.dump_nic_error_log = iwl_dump_nic_error_log,
	.apm_ops = {		.apm_ops = {
	.init = iwl4965_apm_init,		.init = iwl4965_apm_init,
	.reset = iwl4965_apm_reset,		.reset = iwl4965_apm_reset,

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1535,6 +1535,8 @@ struct iwl_lib_ops iwl5000_lib = {
	.rx_handler_setup = iwl5000_rx_handler_setup,		.rx_handler_setup = iwl5000_rx_handler_setup,
	.setup_deferred_work = iwl5000_setup_deferred_work,		.setup_deferred_work = iwl5000_setup_deferred_work,
	.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,		.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
			.dump_nic_event_log = iwl_dump_nic_event_log,
			.dump_nic_error_log = iwl_dump_nic_error_log,
	.load_ucode = iwl5000_load_ucode,		.load_ucode = iwl5000_load_ucode,
	.init_alive_start = iwl5000_init_alive_start,		.init_alive_start = iwl5000_init_alive_start,
	.alive_notify = iwl5000_alive_notify,		.alive_notify = iwl5000_alive_notify,
	@@ -1585,6 +1587,8 @@ static struct iwl_lib_ops iwl5150_lib = {
	.rx_handler_setup = iwl5000_rx_handler_setup,		.rx_handler_setup = iwl5000_rx_handler_setup,
	.setup_deferred_work = iwl5000_setup_deferred_work,		.setup_deferred_work = iwl5000_setup_deferred_work,
	.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,		.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
			.dump_nic_event_log = iwl_dump_nic_event_log,
			.dump_nic_error_log = iwl_dump_nic_error_log,
	.load_ucode = iwl5000_load_ucode,		.load_ucode = iwl5000_load_ucode,
	.init_alive_start = iwl5000_init_alive_start,		.init_alive_start = iwl5000_init_alive_start,
	.alive_notify = iwl5000_alive_notify,		.alive_notify = iwl5000_alive_notify,