aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorAvinash Patil <patila@marvell.com>2014-09-29 12:14:15 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-30 13:17:46 -0400
commitb48f8800bb08f87cded9adb992f04d94b1b77a11 (patch)
tree9643fbf33df521051df1706e7295b899a7442c91 /drivers/net/wireless/mwifiex
parentb43a0d9d01dbe498632e83632a2409a575fcee23 (diff)
mwifiex: remove unnecessary rx_q lock
SKB lists have their own lock. So this lock is not needed. Signed-off-by: Avinash Patil <patila@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/init.c1
-rw-r--r--drivers/net/wireless/mwifiex/main.h2
-rw-r--r--drivers/net/wireless/mwifiex/pcie.c4
-rw-r--r--drivers/net/wireless/mwifiex/sdio.c3
4 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index f7c97cf3840b..580aa45ec4bc 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -447,7 +447,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
447 spin_lock_init(&adapter->cmd_free_q_lock); 447 spin_lock_init(&adapter->cmd_free_q_lock);
448 spin_lock_init(&adapter->cmd_pending_q_lock); 448 spin_lock_init(&adapter->cmd_pending_q_lock);
449 spin_lock_init(&adapter->scan_pending_q_lock); 449 spin_lock_init(&adapter->scan_pending_q_lock);
450 spin_lock_init(&adapter->rx_q_lock);
451 spin_lock_init(&adapter->rx_proc_lock); 450 spin_lock_init(&adapter->rx_proc_lock);
452 451
453 skb_queue_head_init(&adapter->usb_rx_data_q); 452 skb_queue_head_init(&adapter->usb_rx_data_q);
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 022486ed42f2..e2635747d966 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -764,8 +764,6 @@ struct mwifiex_adapter {
764 struct list_head scan_pending_q; 764 struct list_head scan_pending_q;
765 /* spin lock for scan_pending_q */ 765 /* spin lock for scan_pending_q */
766 spinlock_t scan_pending_q_lock; 766 spinlock_t scan_pending_q_lock;
767 /* spin lock for RX queue */
768 spinlock_t rx_q_lock;
769 /* spin lock for RX processing routine */ 767 /* spin lock for RX processing routine */
770 spinlock_t rx_proc_lock; 768 spinlock_t rx_proc_lock;
771 struct sk_buff_head usb_rx_data_q; 769 struct sk_buff_head usb_rx_data_q;
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 74c0db97d79b..c3a20f94f3c9 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -1237,7 +1237,6 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
1237 struct sk_buff *skb_tmp = NULL; 1237 struct sk_buff *skb_tmp = NULL;
1238 struct mwifiex_pcie_buf_desc *desc; 1238 struct mwifiex_pcie_buf_desc *desc;
1239 struct mwifiex_pfu_buf_desc *desc2; 1239 struct mwifiex_pfu_buf_desc *desc2;
1240 unsigned long flags;
1241 1240
1242 if (!mwifiex_pcie_ok_to_access_hw(adapter)) 1241 if (!mwifiex_pcie_ok_to_access_hw(adapter))
1243 mwifiex_pm_wakeup_card(adapter); 1242 mwifiex_pm_wakeup_card(adapter);
@@ -1289,10 +1288,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
1289 card->rxbd_rdptr, wrptr, rx_len); 1288 card->rxbd_rdptr, wrptr, rx_len);
1290 skb_pull(skb_data, INTF_HEADER_LEN); 1289 skb_pull(skb_data, INTF_HEADER_LEN);
1291 if (adapter->rx_work_enabled) { 1290 if (adapter->rx_work_enabled) {
1292 spin_lock_irqsave(&adapter->rx_q_lock, flags);
1293 skb_queue_tail(&adapter->rx_data_q, skb_data); 1291 skb_queue_tail(&adapter->rx_data_q, skb_data);
1294 spin_unlock_irqrestore(&adapter->rx_q_lock,
1295 flags);
1296 adapter->data_received = true; 1292 adapter->data_received = true;
1297 atomic_inc(&adapter->rx_pending); 1293 atomic_inc(&adapter->rx_pending);
1298 } else { 1294 } else {
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index ea8fc587e90f..db9e4e347e4c 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -1039,7 +1039,6 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
1039 struct sk_buff *skb, u32 upld_typ) 1039 struct sk_buff *skb, u32 upld_typ)
1040{ 1040{
1041 u8 *cmd_buf; 1041 u8 *cmd_buf;
1042 unsigned long flags;
1043 __le16 *curr_ptr = (__le16 *)skb->data; 1042 __le16 *curr_ptr = (__le16 *)skb->data;
1044 u16 pkt_len = le16_to_cpu(*curr_ptr); 1043 u16 pkt_len = le16_to_cpu(*curr_ptr);
1045 1044
@@ -1050,9 +1049,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
1050 case MWIFIEX_TYPE_DATA: 1049 case MWIFIEX_TYPE_DATA:
1051 dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n"); 1050 dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n");
1052 if (adapter->rx_work_enabled) { 1051 if (adapter->rx_work_enabled) {
1053 spin_lock_irqsave(&adapter->rx_q_lock, flags);
1054 skb_queue_tail(&adapter->rx_data_q, skb); 1052 skb_queue_tail(&adapter->rx_data_q, skb);
1055 spin_unlock_irqrestore(&adapter->rx_q_lock, flags);
1056 adapter->data_received = true; 1053 adapter->data_received = true;
1057 atomic_inc(&adapter->rx_pending); 1054 atomic_inc(&adapter->rx_pending);
1058 } else { 1055 } else {