From patchwork Thu Jul 6 14:37:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 9828445 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 74CE660361 for ; Thu, 6 Jul 2017 14:43:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6496A285EA for ; Thu, 6 Jul 2017 14:43:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58E4528645; Thu, 6 Jul 2017 14:43:47 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 F33C7285EA for ; Thu, 6 Jul 2017 14:43:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752491AbdGFOnp (ORCPT ); Thu, 6 Jul 2017 10:43:45 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35143 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbdGFOno (ORCPT ); Thu, 6 Jul 2017 10:43:44 -0400 Received: by mail-pf0-f194.google.com with SMTP id q85so563811pfq.2 for ; Thu, 06 Jul 2017 07:43:39 -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=F2PCU03CRE5d1fwyimqA2qc/hzjWm0hj0j1bL4tNWvY=; b=n4qZi4boTVx+F+2HCChDuKehn2+LwOODFmE3sbQJJuUDbtcTiO1J41NCNQaucTsQG4 e372etuUELb6XfFocHheL8S7serh29Axnwvfof8iwu0yGooanccbIKGcdQDzhY5AqPLU DqJrf/zoKwlUFTJqhx04lugqQlRTdGp2AOuJ9nNdYjCcL9Nk5nmXw2oRfObUNUqSJNN4 YsSvJ5S/chw/zPkbjF0N5pSY0RN2aEFdIBcV5MFO+bzXQQYAOtCa+SnUXlbEmOCmAJGM o0utzIcINNHIAaOI7KLHpKasdkTWHYNRQRyuEICBtuwnlGiRn74Mfph5X0fguoPOajha 2gig== 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=F2PCU03CRE5d1fwyimqA2qc/hzjWm0hj0j1bL4tNWvY=; b=goprzfeYM+JcuiNbTJik3b02Cj+7I9sATxsvt9hVvu2sALG7xAkXgY15Aw4N8hbAkn jL9BFZIFtgYZ0srla3JBag47D5UDQqqdgABOxZko1GT7Iqb+jR6J6suiuTkEMkK7gsV3 lZ/7+voAf/mSmIYPe97f56J/IR5/xw+gtzHfYGDUtoNbx3samcu7wTEtHF/B7Lzd5sfr edlH7OKPgn5+addS8DApE+uGJrYCmPqwtQxLwKEMBY6X8Ob+5EGgycXFWsVgRaiHQCNj 5tTFZD5OC0GYdifAuoGHB7CuRurodPH3kofdydDDqtwllRgbjDW5yY2iEfo7QBKPf8DN W7Zg== X-Gm-Message-State: AIVw110QQgw3HRWFNLryvrDYrxWOtpV6EVwFEv/snHywL4wWtY3q6taO 1z2vPbIpFjvYPiGD X-Received: by 10.84.129.69 with SMTP id 63mr28711289plb.0.1499352218840; Thu, 06 Jul 2017 07:43:38 -0700 (PDT) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id i27sm1016460pfi.82.2017.07.06.07.43.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jul 2017 07:43:38 -0700 (PDT) From: Amitkumar Karwar To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar , Prameela Rani Garnepudi , Karun Eagalapati Subject: [v3 21/21] rsi: Rename mutex tx_rxlock to the tx_lock. Date: Thu, 6 Jul 2017 20:07:24 +0530 Message-Id: <1499351844-2046-22-git-send-email-amitkarwar@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499351844-2046-1-git-send-email-amitkarwar@gmail.com> References: <1499351844-2046-1-git-send-email-amitkarwar@gmail.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 29bccb7..709f767 100644 --- a/drivers/net/wireless/rsi/rsi_main.h +++ b/drivers/net/wireless/rsi/rsi_main.h @@ -179,8 +179,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;