From patchwork Fri Jun 16 14:54:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9791961 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6BD6E6038E for ; Fri, 16 Jun 2017 14:58:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5381328614 for ; Fri, 16 Jun 2017 14:58:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4859028649; Fri, 16 Jun 2017 14:58:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C153528614 for ; Fri, 16 Jun 2017 14:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753123AbdFPO6l (ORCPT ); Fri, 16 Jun 2017 10:58:41 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35036 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752609AbdFPO6k (ORCPT ); Fri, 16 Jun 2017 10:58:40 -0400 Received: by mail-pf0-f194.google.com with SMTP id s66so6917579pfs.2 for ; Fri, 16 Jun 2017 07:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bNkl4ZkwN0rxG3Czxci0RwpcHXd1kW8Wlknja0awL8I=; b=cJqEfmgSzCt4ckGkSfU0/uxc7eN+f+iw6IA9+lqPyT2KkJdM0P0s6HY+2rK7bluB6l aQD0qaily6uvK2ikKWkQPaWycY6QHzM0aCldGdPsfG4HAGSP7ha/+7GNpEzoM1QHxd+I /L8bOIHqXcRiIVPA3Yqd/NxjW3w1TJqKDd18m8CMdsKVWFyzV1X2DpzzvDXMCI9h3+ks MrZNoiLQOwzMSXNkDiP+eM6U0iCoME+ICeMfn1yFmO7nuDXCwrTnoY4HL35uutp5Bny2 dKJZMkuCPICZ9l+N4PVXckNcHGCzS95hprL0tBW9+Nq9EakLot4JwSiVR+6beSVJ92jM IFHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bNkl4ZkwN0rxG3Czxci0RwpcHXd1kW8Wlknja0awL8I=; b=YtpCUYAykXVOkC55+ikyzKSI1Hke8e6Y3olXyokVauhcN8djfTaNmTH6Oxo/MgmLZO PLsf16K0vH8tz0/oT7SrNw3wbIQ72gCnIVxsSgA0yCCkSh1eX9YvWGIZLPN9iSmP8oZC fIjAn9wU0WwBrXUK2pVvzKmF7HJoWrYkxyjMCO/rZ/9keeoNjX1Oh0izet3Sa6Bomssq vUoX4wIuv5k9OQnpZ9GQTJrRzrAEtRDzJxvbUr+3W08Bd/zBwW5M2fk7+NABnuzL/EW2 xRVaUa3OP3RPUpcl/7eBkWQcseeq03P5t74lhJILGXslTa7sKU0K4hzKI8kSLNnznWk/ i/+A== X-Gm-Message-State: AKS2vOwXNL0o/pfhuSO04lx1IkvoWTgD2JYdJ/O7qDpHWmdGUtkBOoH/ +iBTw7FPHMbL+pnYPFM= X-Received: by 10.98.81.199 with SMTP id f190mr11738154pfb.109.1497625119861; Fri, 16 Jun 2017 07:58:39 -0700 (PDT) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id 66sm5799930pgh.59.2017.06.16.07.58.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Jun 2017 07:58:39 -0700 (PDT) From: Amitkumar Karwar X-Google-Original-From: Amitkumar Karwar To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar , Karun Eagalapati , Amitkumar Karwar , Prameela Rani Garnepudi Subject: [v2 20/20] rsi: Rename mutex tx_rxlock to the tx_lock. Date: Fri, 16 Jun 2017 20:24:41 +0530 Message-Id: <1497624881-2315-21-git-send-email-amit.karwar@redpinesignals.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497624881-2315-1-git-send-email-amit.karwar@redpinesignals.com> References: <1497624881-2315-1-git-send-email-amit.karwar@redpinesignals.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Karun Eagalapati We have now added separate lock for Rx. This lock is used to protect tx path only Signed-off-by: Karun Eagalapati Signed-off-by: Amitkumar Karwar Signed-off-by: Prameela Rani Garnepudi --- drivers/net/wireless/rsi/rsi_91x_core.c | 10 +++++----- drivers/net/wireless/rsi/rsi_91x_main.c | 2 +- drivers/net/wireless/rsi/rsi_main.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c index 68f04a7..88a1a56 100644 --- a/drivers/net/wireless/rsi/rsi_91x_core.c +++ b/drivers/net/wireless/rsi/rsi_91x_core.c @@ -268,11 +268,11 @@ void rsi_core_qos_processor(struct rsi_common *common) break; } - mutex_lock(&common->tx_rxlock); + mutex_lock(&common->tx_lock); status = adapter->check_hw_queue_status(adapter, q_num); if ((status <= 0)) { - mutex_unlock(&common->tx_rxlock); + mutex_unlock(&common->tx_lock); break; } @@ -287,7 +287,7 @@ void rsi_core_qos_processor(struct rsi_common *common) skb = rsi_core_dequeue_pkt(common, q_num); if (skb == NULL) { rsi_dbg(ERR_ZONE, "skb null\n"); - mutex_unlock(&common->tx_rxlock); + mutex_unlock(&common->tx_lock); break; } @@ -297,14 +297,14 @@ void rsi_core_qos_processor(struct rsi_common *common) status = rsi_send_data_pkt(common, skb); if (status) { - mutex_unlock(&common->tx_rxlock); + mutex_unlock(&common->tx_lock); break; } common->tx_stats.total_tx_pkt_send[q_num]++; tstamp_2 = jiffies; - mutex_unlock(&common->tx_rxlock); + mutex_unlock(&common->tx_lock); if (time_after(tstamp_2, tstamp_1 + (300 * HZ) / 1000)) schedule(); diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c index 939f568..bb0febb 100644 --- a/drivers/net/wireless/rsi/rsi_91x_main.c +++ b/drivers/net/wireless/rsi/rsi_91x_main.c @@ -220,7 +220,7 @@ struct rsi_hw *rsi_91x_init(void) rsi_init_event(&common->tx_thread.event); mutex_init(&common->mutex); - mutex_init(&common->tx_rxlock); + mutex_init(&common->tx_lock); mutex_init(&common->rx_lock); if (rsi_create_kthread(common, diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h index 6d41c9b..d3bf7ac 100644 --- a/drivers/net/wireless/rsi/rsi_main.h +++ b/drivers/net/wireless/rsi/rsi_main.h @@ -177,8 +177,8 @@ struct rsi_common { struct sk_buff_head tx_queue[NUM_EDCA_QUEUES + 1]; /* Mutex declaration */ struct mutex mutex; - /* Mutex used between tx/rx threads */ - struct mutex tx_rxlock; + /* Mutex used for tx thread */ + struct mutex tx_lock; /* Mutex used for rx thread */ struct mutex rx_lock; u8 endpoint;