rsi: Rename mutex tx_rxlock to the tx_lock.

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c
index 68f04a76769e246270ac7d88657d9f4ad97da45b..88a1a56a20ab001f8990d281afc0d796618e5bae 100644 (file)
--- 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 939f568dae9baad5d00a6801d9e5210e29a4d72c..bb0febb17be0208864554c659c3fc3746e31b445 100644 (file)
--- 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 29bccb7079eca34c2ecb05f40a1dca195725b128..709f767aa34b9595a5fd719d445297738c76f04e 100644 (file)
--- 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;