From 192d7d9362423059252dc15db4bb8b89e02eb37e Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 10 Nov 2011 06:55:12 -0800
Subject: [PATCH] --- yaml --- r: 277855 b: refs/heads/master c:
 df912e5119759dad2d2f4b989a5fe83fbdfdeec0 h: refs/heads/master i:   277853:
 8170dfb6ab4d3b20f83762e23f98a2a53421db49   277851:
 b63726cf3e5db409e148c994d1a976418696c8fa   277847:
 b37c4c2bd125f6fe432771b01c6620273bb3725c   277839:
 f768f9286d0c03569a5ac7122730f33c3388f9c1   277823:
 b7b99255425bc1b85001d16e82a5c30d4f35a3c4 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-core.c | 30 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 29b68fed53a7..dac495c42870 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7335613ae27ae148fde720caccbfbbd9afa7465d
+refs/heads/master: df912e5119759dad2d2f4b989a5fe83fbdfdeec0
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
index 001fdf140abb..989f9f3fdaf8 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1125,10 +1125,14 @@ int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
 		    const struct ieee80211_tx_queue_params *params)
 {
 	struct iwl_priv *priv = hw->priv;
-	struct iwl_rxon_context *ctx;
+	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
+	struct iwl_rxon_context *ctx = vif_priv->ctx;
 	unsigned long flags;
 	int q;
 
+	if (WARN_ON(!ctx))
+		return -EINVAL;
+
 	IWL_DEBUG_MAC80211(priv, "enter\n");
 
 	if (!iwl_is_ready_rf(priv->shrd)) {
@@ -1145,21 +1149,15 @@ int iwlagn_mac_conf_tx(struct ieee80211_hw *hw,
 
 	spin_lock_irqsave(&priv->shrd->lock, flags);
 
-	/*
-	 * MULTI-FIXME
-	 * This may need to be done per interface in nl80211/cfg80211/mac80211.
-	 */
-	for_each_context(priv, ctx) {
-		ctx->qos_data.def_qos_parm.ac[q].cw_min =
-			cpu_to_le16(params->cw_min);
-		ctx->qos_data.def_qos_parm.ac[q].cw_max =
-			cpu_to_le16(params->cw_max);
-		ctx->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
-		ctx->qos_data.def_qos_parm.ac[q].edca_txop =
-				cpu_to_le16((params->txop * 32));
-
-		ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0;
-	}
+	ctx->qos_data.def_qos_parm.ac[q].cw_min =
+		cpu_to_le16(params->cw_min);
+	ctx->qos_data.def_qos_parm.ac[q].cw_max =
+		cpu_to_le16(params->cw_max);
+	ctx->qos_data.def_qos_parm.ac[q].aifsn = params->aifs;
+	ctx->qos_data.def_qos_parm.ac[q].edca_txop =
+			cpu_to_le16((params->txop * 32));
+
+	ctx->qos_data.def_qos_parm.ac[q].reserved1 = 0;
 
 	spin_unlock_irqrestore(&priv->shrd->lock, flags);