Commit 47d272f0 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of... 

Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

One more pull-request intended for 4.12.  These are the changes:

 * The firmware for 7265D and 3168 NICs is frozen at version 29;
 * Sari continues working heavily on support for A000 series;
 * A bunch of fixes;
 * Some cleanups here and there;
parents 9cc4b7cb 29108495

drivers/net/wireless/intel/iwlwifi/dvm/lib.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void iwlagn_dev_txfifo_flush(struct iwl_priv *priv) 
		goto done;

	}

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

	iwl_trans_wait_tx_queue_empty(priv->trans, 0xffffffff);

	iwl_trans_wait_tx_queues_empty(priv->trans, 0xffffffff);

done:

	ieee80211_wake_queues(priv->hw);

	mutex_unlock(&priv->mutex);

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

+1 −1
Original line number Diff line number Diff line
@@ -1145,7 +1145,7 @@ static void iwlagn_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	}



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

	iwl_trans_wait_tx_queue_empty(priv->trans, scd_queues);

	iwl_trans_wait_tx_queues_empty(priv->trans, scd_queues);

done:

	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");

drivers/net/wireless/intel/iwlwifi/iwl-7000.c

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	17

#define IWL7265_UCODE_API_MAX	17

#define IWL7265D_UCODE_API_MAX	30

#define IWL3168_UCODE_API_MAX	30

#define IWL7265D_UCODE_API_MAX	29

#define IWL3168_UCODE_API_MAX	29



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	17

drivers/net/wireless/intel/iwlwifi/iwl-a000.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 


static const struct iwl_base_params iwl_a000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_A000,

	.num_of_queues = 31,

	.num_of_queues = 512,

	.shadow_ram_support = true,

	.led_compensation = 57,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ struct iwl_base_params { 
	   apmg_wake_up_wa:1,

	   scd_chain_ext_wa:1;



	u8 num_of_queues;	/* def: HW dependent */

	u16 num_of_queues;	/* def: HW dependent */



	u8 max_ll_items;

	u8 led_compensation;

CRA Git | Maintained and supported by SUSTech CRA and CCSE