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

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

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

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

Some improvements, bugfixes and new features:
 * A bunch of cleanups here and there;
 * A few simple bugfixes;
 * Some more work in preparation for A000 family support;
 * Add support for radiotap timestamps;
 * Some work on our firmware debugging capabilities;
parents 106e0dec 758c98e0

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

+1 −1
Original line number Diff line number Diff line
@@ -2310,7 +2310,7 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file, 
{

	struct iwl_priv *priv = file->private_data;

	bool restart_fw = iwlwifi_mod_params.restart_fw;

	int ret;

	int __maybe_unused ret;



	iwlwifi_mod_params.restart_fw = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
				       REGULATORY_DISABLE_BEACON_HINTS;



#ifdef CONFIG_PM_SLEEP

	if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&

	if (priv->fw->img[IWL_UCODE_WOWLAN].num_sec &&

	    priv->trans->ops->d3_suspend &&

	    priv->trans->ops->d3_resume &&

	    device_can_wakeup(priv->trans->dev)) {

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

+4 −7
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static void rs_program_fix_rate(struct iwl_priv *priv, 
/*

	get the traffic load value for tid

*/

static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)

static void rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid)

{

	u32 curr_time = jiffies_to_msecs(jiffies);

	u32 time_diff;
@@ -372,14 +372,14 @@ static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid) 
	struct iwl_traffic_load *tl = NULL;



	if (tid >= IWL_MAX_TID_COUNT)

		return 0;

		return;



	tl = &(lq_data->load[tid]);



	curr_time -= curr_time % TID_ROUND_VALUE;



	if (!(tl->queue_count))

		return 0;

		return;



	time_diff = TIME_WRAP_AROUND(tl->time_stamp, curr_time);

	index = time_diff / TID_QUEUE_CELL_SPACING;
@@ -388,8 +388,6 @@ static u32 rs_tl_get_load(struct iwl_lq_sta *lq_data, u8 tid) 
	/* TID_MAX_TIME_DIFF */

	if (index >= TID_QUEUE_MAX_SIZE)

		rs_tl_rm_old_stats(tl, curr_time);



	return tl->total;

}



static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
@@ -397,7 +395,6 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, 
				      struct ieee80211_sta *sta)

{

	int ret = -EAGAIN;

	u32 load;



	/*

	 * Don't create TX aggregation sessions when in high
@@ -410,7 +407,7 @@ static int rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv, 
		return ret;

	}



	load = rs_tl_get_load(lq_data, tid);

	rs_tl_get_load(lq_data, tid);



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

			sta->addr, tid);

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

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ int iwl_run_init_ucode(struct iwl_priv *priv) 
	lockdep_assert_held(&priv->mutex);



	/* No init ucode required? Curious, but maybe ok */

	if (!priv->fw->img[IWL_UCODE_INIT].sec[0].len)

	if (!priv->fw->img[IWL_UCODE_INIT].num_sec)

		return 0;



	iwl_init_notification_wait(&priv->notif_wait, &calib_wait,

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

+1 −1
Original line number Diff line number Diff line
@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg = { 
MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));