From: "John W. Linville" <linville@tuxdriver.com>
To: Avinash Patil <patila@marvell.com>
Cc: linux-wireless@vger.kernel.org, akarwar@marvell.com,
huxm@marvell.com, yangyang@marvell.com, cluo@marvell.com,
maithili@marvell.com
Subject: Re: [PATCH 3/3] mwifiex: remove unnecessary rx_q lock
Date: Fri, 26 Sep 2014 13:32:27 -0400 [thread overview]
Message-ID: <20140926173227.GD22967@tuxdriver.com> (raw)
In-Reply-To: <1411645602-18980-3-git-send-email-patila@marvell.com>
I only got 1/3 and 3/3 -- was there a 2/3 posted?
On Thu, Sep 25, 2014 at 05:16:42PM +0530, Avinash Patil wrote:
> SKB lists have their own lock. So this lock is not needed.
>
> Signed-off-by: Avinash Patil <patila@marvell.com>
> ---
> drivers/net/wireless/mwifiex/init.c | 1 -
> drivers/net/wireless/mwifiex/main.h | 2 --
> drivers/net/wireless/mwifiex/pcie.c | 4 ----
> drivers/net/wireless/mwifiex/sdio.c | 3 ---
> 4 files changed, 10 deletions(-)
>
> diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
> index f7c97cf..580aa45 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)
> 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);
> diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
> index 1a99999..b5dc78b 100644
> --- a/drivers/net/wireless/mwifiex/main.h
> +++ b/drivers/net/wireless/mwifiex/main.h
> @@ -763,8 +763,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;
> diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
> index 1504b16..7e8d9b0 100644
> --- a/drivers/net/wireless/mwifiex/pcie.c
> +++ b/drivers/net/wireless/mwifiex/pcie.c
> @@ -1233,7 +1233,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);
> @@ -1285,10 +1284,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 {
> diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
> index ea8fc58..db9e4e3 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,
> 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 {
> --
> 1.8.1.4
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2014-09-26 17:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 11:46 [PATCH 1/3] mwifiex: fix soft lockup during iperf UDP RX Avinash Patil
2014-09-25 11:46 ` [PATCH 3/3] mwifiex: remove unnecessary rx_q lock Avinash Patil
2014-09-26 17:32 ` John W. Linville [this message]
2014-09-29 10:23 ` Avinash Patil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140926173227.GD22967@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=akarwar@marvell.com \
--cc=cluo@marvell.com \
--cc=huxm@marvell.com \
--cc=linux-wireless@vger.kernel.org \
--cc=maithili@marvell.com \
--cc=patila@marvell.com \
--cc=yangyang@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.