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

Commit f51f87a0 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 3b8ab88a 6dc0c7fc

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

+0 −4
Original line number Diff line number Diff line
@@ -171,10 +171,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 


static struct iwl_lib_ops iwl1000_lib = {

	.set_hw_params = iwl1000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

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

+2 −6
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ static int iwl2030_hw_channel_switch(struct iwl_priv *priv, 
	struct ieee80211_vif *vif = ctx->vif;

	struct iwl_host_cmd hcmd = {

		.id = REPLY_CHANNEL_SWITCH,

		.len = sizeof(cmd),

		.len = { sizeof(cmd), },

		.flags = CMD_SYNC,

		.data = &cmd,

		.data = { &cmd, },

	};



	cmd.band = priv->band == IEEE80211_BAND_2GHZ;
@@ -252,10 +252,6 @@ static int iwl2030_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl2000_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

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

+2 −10
Original line number Diff line number Diff line
@@ -282,9 +282,9 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 
	struct ieee80211_vif *vif = ctx->vif;

	struct iwl_host_cmd hcmd = {

		.id = REPLY_CHANNEL_SWITCH,

		.len = sizeof(cmd),

		.len = { sizeof(cmd), },

		.flags = CMD_SYNC,

		.data = &cmd,

		.data = { &cmd, },

	};



	cmd.band = priv->band == IEEE80211_BAND_2GHZ;
@@ -339,10 +339,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl5000_lib = {

	.set_hw_params = iwl5000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
@@ -374,10 +370,6 @@ static struct iwl_lib_ops iwl5000_lib = { 


static struct iwl_lib_ops iwl5150_lib = {

	.set_hw_params = iwl5150_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,

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

+2 −10
Original line number Diff line number Diff line
@@ -221,9 +221,9 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 
	struct ieee80211_vif *vif = ctx->vif;

	struct iwl_host_cmd hcmd = {

		.id = REPLY_CHANNEL_SWITCH,

		.len = sizeof(cmd),

		.len = { sizeof(cmd), },

		.flags = CMD_SYNC,

		.data = &cmd,

		.data = { &cmd, },

	};



	cmd.band = priv->band == IEEE80211_BAND_2GHZ;
@@ -278,10 +278,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, 


static struct iwl_lib_ops iwl6000_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_rx_handler_setup,

	.setup_deferred_work = iwlagn_setup_deferred_work,

	.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
@@ -314,10 +310,6 @@ static struct iwl_lib_ops iwl6000_lib = { 


static struct iwl_lib_ops iwl6030_lib = {

	.set_hw_params = iwl6000_hw_set_hw_params,

	.txq_set_sched = iwlagn_txq_set_sched,

	.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,

	.txq_free_tfd = iwl_hw_txq_free_tfd,

	.txq_init = iwl_hw_tx_queue_init,

	.rx_handler_setup = iwlagn_bt_rx_handler_setup,

	.setup_deferred_work = iwlagn_bt_setup_deferred_work,

	.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,

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

+7 −7
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ int iwl_send_calib_results(struct iwl_priv *priv) 


	struct iwl_host_cmd hcmd = {

		.id = REPLY_PHY_CALIBRATION_CMD,

		.flags = CMD_SIZE_HUGE,

	};



	for (i = 0; i < IWL_CALIB_MAX; i++) {

		if ((BIT(i) & priv->hw_params.calib_init_cfg) &&

		    priv->calib_results[i].buf) {

			hcmd.len = priv->calib_results[i].buf_len;

			hcmd.data = priv->calib_results[i].buf;

			hcmd.len[0] = priv->calib_results[i].buf_len;

			hcmd.data[0] = priv->calib_results[i].buf;

			hcmd.dataflags[0] = IWL_HCMD_DFL_NOCOPY;

			ret = iwl_send_cmd_sync(priv, &hcmd);

			if (ret) {

				IWL_ERR(priv, "Error %d iteration %d\n",
@@ -456,9 +456,9 @@ static int iwl_sensitivity_write(struct iwl_priv *priv) 
	struct iwl_sensitivity_data *data = NULL;

	struct iwl_host_cmd cmd_out = {

		.id = SENSITIVITY_CMD,

		.len = sizeof(struct iwl_sensitivity_cmd),

		.len = { sizeof(struct iwl_sensitivity_cmd), },

		.flags = CMD_ASYNC,

		.data = &cmd,

		.data = { &cmd, },

	};



	data = &(priv->sensitivity_data);
@@ -491,9 +491,9 @@ static int iwl_enhance_sensitivity_write(struct iwl_priv *priv) 
	struct iwl_sensitivity_data *data = NULL;

	struct iwl_host_cmd cmd_out = {

		.id = SENSITIVITY_CMD,

		.len = sizeof(struct iwl_enhance_sensitivity_cmd),

		.len = { sizeof(struct iwl_enhance_sensitivity_cmd), },

		.flags = CMD_ASYNC,

		.data = &cmd,

		.data = { &cmd, },

	};



	data = &(priv->sensitivity_data);