Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b48f8800 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: remove unnecessary rx_q lock 



SKB lists have their own lock. So this lock is not needed.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b43a0d9d

drivers/net/wireless/mwifiex/init.c

+0 −1
Original line number Diff line number Diff line
@@ -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_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);



	skb_queue_head_init(&adapter->usb_rx_data_q);

drivers/net/wireless/mwifiex/main.h

+0 −2
Original line number Diff line number Diff line
@@ -764,8 +764,6 @@ struct mwifiex_adapter { 
	struct list_head scan_pending_q;

	/* spin lock for scan_pending_q */

	spinlock_t scan_pending_q_lock;

	/* spin lock for RX queue */

	spinlock_t rx_q_lock;

	/* spin lock for RX processing routine */

	spinlock_t rx_proc_lock;

	struct sk_buff_head usb_rx_data_q;

drivers/net/wireless/mwifiex/pcie.c

+0 −4
Original line number Diff line number Diff line
@@ -1237,7 +1237,6 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) 
	struct sk_buff *skb_tmp = NULL;

	struct mwifiex_pcie_buf_desc *desc;

	struct mwifiex_pfu_buf_desc *desc2;

	unsigned long flags;



	if (!mwifiex_pcie_ok_to_access_hw(adapter))

		mwifiex_pm_wakeup_card(adapter);
@@ -1289,10 +1288,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) 
				card->rxbd_rdptr, wrptr, rx_len);

			skb_pull(skb_data, INTF_HEADER_LEN);

			if (adapter->rx_work_enabled) {

				spin_lock_irqsave(&adapter->rx_q_lock, flags);

				skb_queue_tail(&adapter->rx_data_q, skb_data);

				spin_unlock_irqrestore(&adapter->rx_q_lock,

						       flags);

				adapter->data_received = true;

				atomic_inc(&adapter->rx_pending);

			} else {

drivers/net/wireless/mwifiex/sdio.c

+0 −3
Original line number Diff line number Diff line
@@ -1039,7 +1039,6 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, 
				    struct sk_buff *skb, u32 upld_typ)

{

	u8 *cmd_buf;

	unsigned long flags;

	__le16 *curr_ptr = (__le16 *)skb->data;

	u16 pkt_len = le16_to_cpu(*curr_ptr);
@@ -1050,9 +1049,7 @@ static int mwifiex_decode_rx_packet(struct mwifiex_adapter *adapter, 
	case MWIFIEX_TYPE_DATA:

		dev_dbg(adapter->dev, "info: --- Rx: Data packet ---\n");

		if (adapter->rx_work_enabled) {

			spin_lock_irqsave(&adapter->rx_q_lock, flags);

			skb_queue_tail(&adapter->rx_data_q, skb);

			spin_unlock_irqrestore(&adapter->rx_q_lock, flags);

			adapter->data_received = true;

			atomic_inc(&adapter->rx_pending);

		} else {