From: Amitkumar Karwar <amitkarwar@gmail.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org,
Amitkumar Karwar <amit.karwar@redpinesignals.com>,
Prameela Rani Garnepudi <prameela.j04cs@gmail.com>,
Karun Eagalapati <karun256@gmail.com>
Subject: [v3 21/21] rsi: Rename mutex tx_rxlock to the tx_lock.
Date: Thu, 6 Jul 2017 20:07:24 +0530 [thread overview]
Message-ID: <1499351844-2046-22-git-send-email-amitkarwar@gmail.com> (raw)
In-Reply-To: <1499351844-2046-1-git-send-email-amitkarwar@gmail.com>
From: Karun Eagalapati <karun256@gmail.com>
We have now added separate lock for Rx. This lock is used to protect
tx path only
Signed-off-by: Karun Eagalapati <karun256@gmail.com>
Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: Prameela Rani Garnepudi <prameela.j04cs@gmail.com>
---
drivers/net/wireless/rsi/rsi_91x_core.c | 10 +++++-----
drivers/net/wireless/rsi/rsi_91x_main.c | 2 +-
drivers/net/wireless/rsi/rsi_main.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c
index 68f04a7..88a1a56 100644
--- a/drivers/net/wireless/rsi/rsi_91x_core.c
+++ b/drivers/net/wireless/rsi/rsi_91x_core.c
@@ -268,11 +268,11 @@ void rsi_core_qos_processor(struct rsi_common *common)
break;
}
- mutex_lock(&common->tx_rxlock);
+ mutex_lock(&common->tx_lock);
status = adapter->check_hw_queue_status(adapter, q_num);
if ((status <= 0)) {
- mutex_unlock(&common->tx_rxlock);
+ mutex_unlock(&common->tx_lock);
break;
}
@@ -287,7 +287,7 @@ void rsi_core_qos_processor(struct rsi_common *common)
skb = rsi_core_dequeue_pkt(common, q_num);
if (skb == NULL) {
rsi_dbg(ERR_ZONE, "skb null\n");
- mutex_unlock(&common->tx_rxlock);
+ mutex_unlock(&common->tx_lock);
break;
}
@@ -297,14 +297,14 @@ void rsi_core_qos_processor(struct rsi_common *common)
status = rsi_send_data_pkt(common, skb);
if (status) {
- mutex_unlock(&common->tx_rxlock);
+ mutex_unlock(&common->tx_lock);
break;
}
common->tx_stats.total_tx_pkt_send[q_num]++;
tstamp_2 = jiffies;
- mutex_unlock(&common->tx_rxlock);
+ mutex_unlock(&common->tx_lock);
if (time_after(tstamp_2, tstamp_1 + (300 * HZ) / 1000))
schedule();
diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c
index 939f568..bb0febb 100644
--- a/drivers/net/wireless/rsi/rsi_91x_main.c
+++ b/drivers/net/wireless/rsi/rsi_91x_main.c
@@ -220,7 +220,7 @@ struct rsi_hw *rsi_91x_init(void)
rsi_init_event(&common->tx_thread.event);
mutex_init(&common->mutex);
- mutex_init(&common->tx_rxlock);
+ mutex_init(&common->tx_lock);
mutex_init(&common->rx_lock);
if (rsi_create_kthread(common,
diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h
index 29bccb7..709f767 100644
--- a/drivers/net/wireless/rsi/rsi_main.h
+++ b/drivers/net/wireless/rsi/rsi_main.h
@@ -179,8 +179,8 @@ struct rsi_common {
struct sk_buff_head tx_queue[NUM_EDCA_QUEUES + 1];
/* Mutex declaration */
struct mutex mutex;
- /* Mutex used between tx/rx threads */
- struct mutex tx_rxlock;
+ /* Mutex used for tx thread */
+ struct mutex tx_lock;
/* Mutex used for rx thread */
struct mutex rx_lock;
u8 endpoint;
--
2.7.4
prev parent reply other threads:[~2017-07-06 14:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-06 14:37 [v3 00/21] rsi driver enhancements Amitkumar Karwar
2017-07-06 14:37 ` [v3 01/21] rsi: use BUILD_BUG_ON check for fsm_state Amitkumar Karwar
2017-07-28 14:24 ` [v3,01/21] " Kalle Valo
2017-07-06 14:37 ` [v3 02/21] rsi: changes in eeprom read frame Amitkumar Karwar
2017-07-06 14:37 ` [v3 03/21] rsi: fix sdio card reset problem Amitkumar Karwar
2017-07-06 14:37 ` [v3 04/21] rsi: chip reset for SDIO interface Amitkumar Karwar
2017-07-06 14:37 ` [v3 05/21] rsi: correct SDIO disconnect path handling Amitkumar Karwar
2017-07-06 14:37 ` [v3 06/21] rsi: card reset for USB interface Amitkumar Karwar
2017-07-06 14:37 ` [v3 07/21] rsi: USB tx headroom cleanup Amitkumar Karwar
2017-07-06 14:37 ` [v3 08/21] rsi: correct the logic of deriving queue number Amitkumar Karwar
2017-07-06 14:37 ` [v3 09/21] rsi: rename USB endpoint macros Amitkumar Karwar
2017-07-06 14:37 ` [v3 10/21] rsi: choose correct endpoint based on queue Amitkumar Karwar
2017-07-06 14:37 ` [v3 11/21] rsi: set immediate wakeup bit Amitkumar Karwar
2017-07-06 14:37 ` [v3 12/21] rsi: management frame descriptor preparation cleanup Amitkumar Karwar
2017-07-06 14:37 ` [v3 13/21] rsi: separate function for management packet descriptor Amitkumar Karwar
2017-07-06 14:37 ` [v3 14/21] rsi: data packet descriptor code cleanup Amitkumar Karwar
2017-07-06 14:37 ` [v3 15/21] rsi: data packet descriptor enhancements Amitkumar Karwar
2017-07-06 14:37 ` [v3 16/21] rsi: separate function for data packet descriptor Amitkumar Karwar
2017-07-06 14:37 ` [v3 17/21] rsi: rename variable in_sdio_litefi_irq Amitkumar Karwar
2017-07-06 14:37 ` [v3 18/21] rsi: Optimise sdio claim and release host Amitkumar Karwar
2017-07-06 14:37 ` [v3 19/21] rsi: SDIO Rx packet processing enhancement Amitkumar Karwar
2017-07-06 14:37 ` [v3 20/21] rsi: use separate mutex lock for receive thread Amitkumar Karwar
2017-07-06 14:37 ` Amitkumar Karwar [this message]
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=1499351844-2046-22-git-send-email-amitkarwar@gmail.com \
--to=amitkarwar@gmail.com \
--cc=amit.karwar@redpinesignals.com \
--cc=karun256@gmail.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=prameela.j04cs@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).