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

Commit f318d658 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 42c4568a 1db5950f

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

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.use_rts_for_ht = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

};
@@ -274,7 +274,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

};

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

+3 −5
Original line number Diff line number Diff line
@@ -2470,11 +2470,9 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv) 
	memset((void *)&priv->hw_params, 0,

	       sizeof(struct iwl_hw_params));



	priv->shared_virt =

	    pci_alloc_consistent(priv->pci_dev,

	priv->shared_virt = dma_alloc_coherent(&priv->pci_dev->dev,

					       sizeof(struct iwl3945_shared),

				 &priv->shared_phys);



					       &priv->shared_phys, GFP_KERNEL);

	if (!priv->shared_virt) {

		IWL_ERR(priv, "failed to allocate pci memory\n");

		mutex_unlock(&priv->mutex);

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

+7 −0
Original line number Diff line number Diff line
@@ -581,6 +581,13 @@ static int iwl4965_alive_notify(struct iwl_priv *priv) 


	iwl4965_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);



	/* make sure all queue are not stopped */

	memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));

	for (i = 0; i < 4; i++)

		atomic_set(&priv->queue_stop_count[i], 0);



	/* reset to 0 to enable all the queue first */

	priv->txq_ctx_active_msk = 0;

	/* Map each Tx/cmd queue to its corresponding fifo */

	for (i = 0; i < ARRAY_SIZE(default_queue_to_tx_fifo); i++) {

		int ac = default_queue_to_tx_fifo[i];

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

+7 −0
Original line number Diff line number Diff line
@@ -648,6 +648,13 @@ int iwl5000_alive_notify(struct iwl_priv *priv) 


	iwl5000_set_wr_ptrs(priv, IWL_CMD_QUEUE_NUM, 0);



	/* make sure all queue are not stopped */

	memset(&priv->queue_stopped[0], 0, sizeof(priv->queue_stopped));

	for (i = 0; i < 4; i++)

		atomic_set(&priv->queue_stop_count[i], 0);



	/* reset to 0 to enable all the queue first */

	priv->txq_ctx_active_msk = 0;

	/* map qos queues to fifos one-to-one */

	for (i = 0; i < ARRAY_SIZE(iwl5000_default_queue_to_tx_fifo); i++) {

		int ac = iwl5000_default_queue_to_tx_fifo[i];

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

+14 −1
Original line number Diff line number Diff line
@@ -298,10 +298,23 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, 
				      struct iwl_lq_sta *lq_data, u8 tid,

				      struct ieee80211_sta *sta)

{

	int ret;



	if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {

		IWL_DEBUG_HT(priv, "Starting Tx agg: STA: %pM tid: %d\n",

				sta->addr, tid);

		ieee80211_start_tx_ba_session(sta, tid);

		ret = ieee80211_start_tx_ba_session(sta, tid);

		if (ret == -EAGAIN) {

			/*

			 * driver and mac80211 is out of sync

			 * this might be cause by reloading firmware

			 * stop the tx ba session here

			 */

			IWL_DEBUG_HT(priv, "Fail start Tx agg on tid: %d\n",

				tid);

			ret = ieee80211_stop_tx_ba_session(sta, tid,

						WLAN_BACK_INITIATOR);

		}

	}

}