All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: <ath10k@lists.infradead.org>
Cc: <linux-wireless@vger.kernel.org>
Subject: [PATCH v3 3/7] ath10k: set max_num_pending_tx in ath10k_core_init_firmware_features()
Date: Mon, 1 Dec 2014 16:45:34 +0200	[thread overview]
Message-ID: <20141201144534.18248.51909.stgit@potku.adurom.net> (raw)
In-Reply-To: <20141201144400.18248.62714.stgit@potku.adurom.net>

Better to have this in same place as other firmware interface handling.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.c   |    2 ++
 drivers/net/wireless/ath/ath10k/htt_tx.c |    5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index f8ddc8087db9..1170fd739675 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -824,11 +824,13 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
 	case ATH10K_FW_WMI_OP_VERSION_MAIN:
 		ar->max_num_peers = TARGET_NUM_PEERS;
 		ar->max_num_stations = TARGET_NUM_STATIONS;
+		ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;
 		break;
 	case ATH10K_FW_WMI_OP_VERSION_10_1:
 	case ATH10K_FW_WMI_OP_VERSION_10_2:
 		ar->max_num_peers = TARGET_10X_NUM_PEERS;
 		ar->max_num_stations = TARGET_10X_NUM_STATIONS;
+		ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
 		break;
 	}
 
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 4bc51d8a14a3..a1bda41fb543 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -93,11 +93,6 @@ int ath10k_htt_tx_alloc(struct ath10k_htt *htt)
 
 	spin_lock_init(&htt->tx_lock);
 
-	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, htt->ar->fw_features))
-		htt->max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
-	else
-		htt->max_num_pending_tx = TARGET_NUM_MSDU_DESC;
-
 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "htt tx max num pending tx %d\n",
 		   htt->max_num_pending_tx);
 


WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v3 3/7] ath10k: set max_num_pending_tx in ath10k_core_init_firmware_features()
Date: Mon, 1 Dec 2014 16:45:34 +0200	[thread overview]
Message-ID: <20141201144534.18248.51909.stgit@potku.adurom.net> (raw)
In-Reply-To: <20141201144400.18248.62714.stgit@potku.adurom.net>

Better to have this in same place as other firmware interface handling.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.c   |    2 ++
 drivers/net/wireless/ath/ath10k/htt_tx.c |    5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index f8ddc8087db9..1170fd739675 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -824,11 +824,13 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
 	case ATH10K_FW_WMI_OP_VERSION_MAIN:
 		ar->max_num_peers = TARGET_NUM_PEERS;
 		ar->max_num_stations = TARGET_NUM_STATIONS;
+		ar->htt.max_num_pending_tx = TARGET_NUM_MSDU_DESC;
 		break;
 	case ATH10K_FW_WMI_OP_VERSION_10_1:
 	case ATH10K_FW_WMI_OP_VERSION_10_2:
 		ar->max_num_peers = TARGET_10X_NUM_PEERS;
 		ar->max_num_stations = TARGET_10X_NUM_STATIONS;
+		ar->htt.max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
 		break;
 	}
 
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 4bc51d8a14a3..a1bda41fb543 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -93,11 +93,6 @@ int ath10k_htt_tx_alloc(struct ath10k_htt *htt)
 
 	spin_lock_init(&htt->tx_lock);
 
-	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, htt->ar->fw_features))
-		htt->max_num_pending_tx = TARGET_10X_NUM_MSDU_DESC;
-	else
-		htt->max_num_pending_tx = TARGET_NUM_MSDU_DESC;
-
 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "htt tx max num pending tx %d\n",
 		   htt->max_num_pending_tx);
 


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  parent reply	other threads:[~2014-12-01 14:45 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-01 14:44 [PATCH v3 0/7] ath10k: add support for new wmi-tlv backend Kalle Valo
2014-12-01 14:44 ` Kalle Valo
2014-12-01 14:44 ` [PATCH v3 1/7] ath10k: create ath10k_core_init_features() Kalle Valo
2014-12-01 14:44   ` Kalle Valo
2014-12-02  6:58   ` Michal Kazior
2014-12-02  6:58     ` Michal Kazior
2014-12-02  7:09     ` Kalle Valo
2014-12-02  7:09       ` Kalle Valo
2014-12-01 14:45 ` [PATCH v3 2/7] ath10k: add ATH10K_FW_IE_WMI_OP_VERSION Kalle Valo
2014-12-01 14:45   ` Kalle Valo
2014-12-02  8:28   ` Michal Kazior
2014-12-02  8:28     ` Michal Kazior
2014-12-02  8:48     ` Kalle Valo
2014-12-02  8:48       ` Kalle Valo
2014-12-02 11:51   ` Michal Kazior
2014-12-02 11:51     ` Michal Kazior
2014-12-03  6:32     ` Kalle Valo
2014-12-03  6:32       ` Kalle Valo
2014-12-02 12:16   ` Michal Kazior
2014-12-02 12:16     ` Michal Kazior
2014-12-03  6:30     ` Kalle Valo
2014-12-03  6:30       ` Kalle Valo
2014-12-01 14:45 ` Kalle Valo [this message]
2014-12-01 14:45   ` [PATCH v3 3/7] ath10k: set max_num_pending_tx in ath10k_core_init_firmware_features() Kalle Valo
2014-12-01 14:45 ` [PATCH v3 4/7] ath10k: implement intermediate event args Kalle Valo
2014-12-01 14:45   ` Kalle Valo
2014-12-01 14:46 ` [PATCH v3 5/7] ath10k: introduce wmi ops Kalle Valo
2014-12-01 14:46   ` Kalle Valo
2014-12-01 14:46 ` [PATCH v3 6/7] ath10k: make some wmi functions public Kalle Valo
2014-12-01 14:46   ` Kalle Valo
2014-12-01 14:46 ` [PATCH v3 7/7] ath10k: implement wmi-tlv backend Kalle Valo
2014-12-01 14:46   ` Kalle Valo
2014-12-02  6:38   ` Michal Kazior
2014-12-02  6:38     ` Michal Kazior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20141201144534.18248.51909.stgit@potku.adurom.net \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.