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

Commit 0cf151bd authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-03-12' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-03-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* Location Aware Regulatory was added by Arik
* 8000 device family work
* Update to the BT Coex firmware API
parents 719a11cd 208d271a

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+9 −8
Original line number Diff line number Diff line
@@ -1114,16 +1114,17 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	scd_queues &= ~(BIT(IWL_IPAN_CMD_QUEUE_NUM) |

			BIT(IWL_DEFAULT_CMD_QUEUE_NUM));



	if (vif)

		scd_queues &= ~BIT(vif->hw_queue[IEEE80211_AC_VO]);



	IWL_DEBUG_TX_QUEUES(priv, "Flushing SCD queues: 0x%x\n", scd_queues);

	if (drop) {

		IWL_DEBUG_TX_QUEUES(priv, "Flushing SCD queues: 0x%x\n",

				    scd_queues);

		if (iwlagn_txfifo_flush(priv, scd_queues)) {

			IWL_ERR(priv, "flush request fail\n");

			goto done;

		}

	}



	IWL_DEBUG_TX_QUEUES(priv, "wait transmit/flush all frames\n");

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

	iwl_trans_wait_tx_queue_empty(priv->trans, scd_queues);

done:

	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");

drivers/net/wireless/iwlwifi/dvm/rs.c

+4 −3
Original line number Diff line number Diff line
@@ -3158,7 +3158,8 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file, 
		   ((is_mimo2(tbl->lq_type)) ? "MIMO2" : "MIMO3"));

		desc += sprintf(buff + desc, " %s",

		   (tbl->is_ht40) ? "40MHz" : "20MHz");

		   desc += sprintf(buff+desc, " %s %s %s\n", (tbl->is_SGI) ? "SGI" : "",

		desc += sprintf(buff + desc, " %s %s %s\n",

		   (tbl->is_SGI) ? "SGI" : "",

		   (lq_sta->is_green) ? "GF enabled" : "",

		   (lq_sta->is_agg) ? "AGG on" : "");

	}

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

+4 −2
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.base_params = &iwl1000_base_params,			\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -121,7 +122,8 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.base_params = &iwl1000_base_params,			\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

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

+9 −4
Original line number Diff line number Diff line
@@ -123,7 +123,9 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.base_params = &iwl2000_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K





const struct iwl_cfg iwl2000_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",
@@ -149,7 +151,8 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2030_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -170,7 +173,8 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.base_params = &iwl2000_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -197,7 +201,8 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.base_params = &iwl2030_base_params,			\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

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

+4 −2
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.base_params = &iwl5000_base_params,			\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -158,7 +159,8 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.base_params = &iwl5000_base_params,			\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K



const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",