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

Commit 6ae4ccfe authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2014-03-22' of... 

Merge tag 'iwlwifi-for-kalle-2014-03-22' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

* avoid panic with lots of IBSS stations
* Fix dvm's behavior after suspend resume
* Allow to keep connection after CSA failure
* Remove a noisy by harmless WARN_ON
* New device IDs
parents be0b5e63 1f16ea29

drivers/net/wireless/iwlwifi/dvm/dev.h

+0 −1
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ struct iwl_priv { 
	unsigned long reload_jiffies;

	int reload_count;

	bool ucode_loaded;

	bool init_ucode_run;		/* Don't run init uCode again */



	u8 plcp_delta_threshold;

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/ucode.c

+0 −5
Original line number Diff line number Diff line
@@ -418,9 +418,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv) 
	if (!priv->fw->img[IWL_UCODE_INIT].sec[0].len)

		return 0;



	if (priv->init_ucode_run)

		return 0;



	iwl_init_notification_wait(&priv->notif_wait, &calib_wait,

				   calib_complete, ARRAY_SIZE(calib_complete),

				   iwlagn_wait_calib, priv);
@@ -440,8 +437,6 @@ int iwl_run_init_ucode(struct iwl_priv *priv) 
	 */

	ret = iwl_wait_notification(&priv->notif_wait, &calib_wait,

					UCODE_CALIB_TIMEOUT);

	if (!ret)

		priv->init_ucode_run = true;



	goto out;

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

+22 −2
Original line number Diff line number Diff line
@@ -1278,6 +1278,9 @@ static void rs_mac80211_tx_status(void *mvm_r, 
	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	if (!iwl_mvm_sta_from_mac80211(sta)->vif)

		return;



	if (!ieee80211_is_data(hdr->frame_control) ||

	    info->flags & IEEE80211_TX_CTL_NO_ACK)

		return;
@@ -2511,6 +2514,14 @@ static void rs_get_rate(void *mvm_r, struct ieee80211_sta *sta, void *mvm_sta, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct iwl_lq_sta *lq_sta = mvm_sta;



	if (sta && !iwl_mvm_sta_from_mac80211(sta)->vif) {

		/* if vif isn't initialized mvm doesn't know about

		 * this station, so don't do anything with the it

		 */

		sta = NULL;

		mvm_sta = NULL;

	}



	/* TODO: handle rate_idx_mask and rate_idx_mcs_mask */



	/* Treat uninitialized rate scaling data same as non-existing. */
@@ -2827,6 +2838,9 @@ static void rs_rate_update(void *mvm_r, 
			(struct iwl_op_mode *)mvm_r;

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);



	if (!iwl_mvm_sta_from_mac80211(sta)->vif)

		return;



	/* Stop any ongoing aggregations as rs starts off assuming no agg */

	for (tid = 0; tid < IWL_MAX_TID_COUNT; tid++)

		ieee80211_stop_tx_ba_session(sta, tid);
@@ -3587,9 +3601,15 @@ static ssize_t iwl_dbgfs_ss_force_write(struct iwl_lq_sta *lq_sta, char *buf, 


MVM_DEBUGFS_READ_WRITE_FILE_OPS(ss_force, 32);



static void rs_add_debugfs(void *mvm, void *mvm_sta, struct dentry *dir)

static void rs_add_debugfs(void *mvm, void *priv_sta, struct dentry *dir)

{

	struct iwl_lq_sta *lq_sta = mvm_sta;

	struct iwl_lq_sta *lq_sta = priv_sta;

	struct iwl_mvm_sta *mvmsta;



	mvmsta = container_of(lq_sta, struct iwl_mvm_sta, lq_sta);



	if (!mvmsta->vif)

		return;



	debugfs_create_file("rate_scale_table", S_IRUSR | S_IWUSR, dir,

			    lq_sta, &rs_sta_dbgfs_scale_table_ops);

drivers/net/wireless/iwlwifi/mvm/time-event.c

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm, 
			     struct iwl_time_event_notif *notif)

{

	if (!le32_to_cpu(notif->status)) {

		if (te_data->vif->type == NL80211_IFTYPE_STATION)

			ieee80211_connection_loss(te_data->vif);

		IWL_DEBUG_TE(mvm, "CSA time event failed to start\n");

		iwl_mvm_te_clear_data(mvm, te_data);

		return;