leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rsi: Rename mutex tx_rxlock to the tx_lock.

Browse Source 
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>
This commit is contained in:
Karun Eagalapati 2017-07-06 20:07:24 +05:30 committed by Kalle Valo
parent 6c409cad3d
commit cb16453565
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/rsi/rsi_91x_core.c
View File

@ -268,11 +268,11 @@ void rsi_core_qos_processor(struct rsi_common *common)
break; break;
} }
mutex_lock(&common->tx_rxlock); mutex_lock(&common->tx_lock);
status = adapter->check_hw_queue_status(adapter, q_num); status = adapter->check_hw_queue_status(adapter, q_num);
if ((status <= 0)) { if ((status <= 0)) {
mutex_unlock(&common->tx_rxlock); mutex_unlock(&common->tx_lock);
break; break;
} }
@ -287,7 +287,7 @@ void rsi_core_qos_processor(struct rsi_common *common)
skb = rsi_core_dequeue_pkt(common, q_num); skb = rsi_core_dequeue_pkt(common, q_num);
if (skb == NULL) { if (skb == NULL) {
rsi_dbg(ERR_ZONE, "skb null\n"); rsi_dbg(ERR_ZONE, "skb null\n");
mutex_unlock(&common->tx_rxlock); mutex_unlock(&common->tx_lock);
break; break;
} }
@ -297,14 +297,14 @@ void rsi_core_qos_processor(struct rsi_common *common)
status = rsi_send_data_pkt(common, skb); status = rsi_send_data_pkt(common, skb);
if (status) { if (status) {
mutex_unlock(&common->tx_rxlock); mutex_unlock(&common->tx_lock);
break; break;
} }
common->tx_stats.total_tx_pkt_send[q_num]++; common->tx_stats.total_tx_pkt_send[q_num]++;
tstamp_2 = jiffies; tstamp_2 = jiffies;
mutex_unlock(&common->tx_rxlock); mutex_unlock(&common->tx_lock);
if (time_after(tstamp_2, tstamp_1 + (300 * HZ) / 1000)) if (time_after(tstamp_2, tstamp_1 + (300 * HZ) / 1000))
schedule(); schedule();

2
drivers/net/wireless/rsi/rsi_91x_main.c
View File

@ -220,7 +220,7 @@ struct rsi_hw *rsi_91x_init(void)
rsi_init_event(&common->tx_thread.event); rsi_init_event(&common->tx_thread.event);
mutex_init(&common->mutex); mutex_init(&common->mutex);
mutex_init(&common->tx_rxlock); mutex_init(&common->tx_lock);
mutex_init(&common->rx_lock); mutex_init(&common->rx_lock);
if (rsi_create_kthread(common, if (rsi_create_kthread(common,

4
drivers/net/wireless/rsi/rsi_main.h
View File

@ -179,8 +179,8 @@ struct rsi_common {
struct sk_buff_head tx_queue[NUM_EDCA_QUEUES + 1]; struct sk_buff_head tx_queue[NUM_EDCA_QUEUES + 1];
/* Mutex declaration */ /* Mutex declaration */
struct mutex mutex; struct mutex mutex;
/* Mutex used between tx/rx threads */ /* Mutex used for tx thread */
struct mutex tx_rxlock; struct mutex tx_lock;
/* Mutex used for rx thread */ /* Mutex used for rx thread */
struct mutex rx_lock; struct mutex rx_lock;
u8 endpoint; u8 endpoint;