提交 b48f8800 编写于 作者: A Avinash Patil 提交者: John W. Linville

mwifiex: remove unnecessary rx_q lock

SKB lists have their own lock. So this lock is not needed.
Signed-off-by: NAvinash Patil <patila@marvell.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 b43a0d9d
...@@ -447,7 +447,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter) ...@@ -447,7 +447,6 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter)
spin_lock_init(&adapter->cmd_free_q_lock); spin_lock_init(&adapter->cmd_free_q_lock);
spin_lock_init(&adapter->cmd_pending_q_lock); spin_lock_init(&adapter->cmd_pending_q_lock);
spin_lock_init(&adapter->scan_pending_q_lock); spin_lock_init(&adapter->scan_pending_q_lock);
spin_lock_init(&adapter->rx_q_lock);
spin_lock_init(&adapter->rx_proc_lock); spin_lock_init(&adapter->rx_proc_lock);
skb_queue_head_init(&adapter->usb_rx_data_q); skb_queue_head_init(&adapter->usb_rx_data_q);
......
...@@ -764,8 +764,6 @@ struct mwifiex_adapter { ...@@ -764,8 +764,6 @@ struct mwifiex_adapter {
struct list_head scan_pending_q; struct list_head scan_pending_q;
/* spin lock for scan_pending_q */ /* spin lock for scan_pending_q */
spinlock_t scan_pending_q_lock; spinlock_t scan_pending_q_lock;
/* spin lock for RX queue */
spinlock_t rx_q_lock;
/* spin lock for RX processing routine */ /* spin lock for RX processing routine */
spinlock_t rx_proc_lock; spinlock_t rx_proc_lock;
struct sk_buff_head usb_rx_data_q; struct sk_buff_head usb_rx_data_q;
......
...@@ -1237,7 +1237,6 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) ...@@ -1237,7 +1237,6 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
struct sk_buff *skb_tmp = NULL; struct sk_buff *skb_tmp = NULL;
struct mwifiex_pcie_buf_desc *desc; struct mwifiex_pcie_buf_desc *desc;
struct mwifiex_pfu_buf_desc *desc2; struct mwifiex_pfu_buf_desc *desc2;
unsigned long flags;
if (!mwifiex_pcie_ok_to_access_hw(adapter)) if (!mwifiex_pcie_ok_to_access_hw(adapter))
mwifiex_pm_wakeup_card(adapter); mwifiex_pm_wakeup_card(adapter);
...@@ -1289,10 +1288,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) ...@@ -1289,10 +1288,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
card->rxbd_rdptr, wrptr, rx_len); card->rxbd_rdptr, wrptr, rx_len);
skb_pull(skb_data, INTF_HEADER_LEN); skb_pull(skb_data, INTF_HEADER_LEN);
if (adapter->rx_work_enabled) { if (adapter->rx_work_enabled) {
spin_lock_irqsave(&adapter->rx_q_lock, flags);
skb_queue_tail(&adapter->rx_data_q, skb_data); skb_queue_tail(&adapter->rx_data_q, skb_data);
spin_unlock_irqrestore(&adapter->rx_q_lock,
flags);
adapter->data_received = true; adapter->data_received = true;
atomic_inc(&adapter->rx_pending); atomic_inc(&adapter->rx_pending);
} else { } else {
......
...@@ -1039,7 +1039,6 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, ...@@ -1039,7 +1039,6 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
struct sk_buff *skb, u32 upld_typ) struct sk_buff *skb, u32 upld_typ)
{ {
u8 *cmd_buf; u8 *cmd_buf;
unsigned long flags;
__le16 *curr_ptr = (__le16 *)skb->data; __le16 *curr_ptr = (__le16 *)skb->data;
u16 pkt_len = le16_to_cpu(*curr_ptr); u16 pkt_len = le16_to_cpu(*curr_ptr);
...@@ -1050,9 +1049,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, ...@@ -1050,9 +1049,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter,
case MWIFIEX_TYPE_DATA: case MWIFIEX_TYPE_DATA:
dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n"); dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n");
if (adapter->rx_work_enabled) { if (adapter->rx_work_enabled) {
spin_lock_irqsave(&adapter->rx_q_lock, flags);
skb_queue_tail(&adapter->rx_data_q, skb); skb_queue_tail(&adapter->rx_data_q, skb);
spin_unlock_irqrestore(&adapter->rx_q_lock, flags);
adapter->data_received = true; adapter->data_received = true;
atomic_inc(&adapter->rx_pending); atomic_inc(&adapter->rx_pending);
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册