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

Commit 9c93ac87 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
parents 1eb9ed1e 1745e440

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

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ static const struct iwl_sensitivity_ranges iwl1000_sensitivity = { 


static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)

{

	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);



	hw_params(priv).tx_chains_num =

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

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ static const struct iwl_sensitivity_ranges iwl2000_sensitivity = { 


static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)

{

	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);



	hw_params(priv).tx_chains_num =

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

+0 −4
Original line number Diff line number Diff line
@@ -156,8 +156,6 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv) 


static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)

{

	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);
@@ -174,8 +172,6 @@ static void iwl5000_hw_set_hw_params(struct iwl_priv *priv) 


static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)

{

	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);

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

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ static const struct iwl_sensitivity_ranges iwl6000_sensitivity = { 


static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)

{

	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);

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

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, 
	 * (in Tx queue's circular buffer) of first TFD/frame in window */

	u16 ba_resp_scd_ssn = le16_to_cpu(ba_resp->scd_ssn);



	if (scd_flow >= hw_params(priv).max_txq_num) {

	if (scd_flow >= cfg(priv)->base_params->num_of_queues) {

		IWL_ERR(priv,

			"BUG_ON scd_flow is bigger than number of queues\n");

		return 0;