From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6802949681377705984 X-Received: by 2002:aca:c6d1:: with SMTP id w200mr6009510oif.43.1584095366997; Fri, 13 Mar 2020 03:29:26 -0700 (PDT) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 2002:a9d:6082:: with SMTP id m2ls2662634otj.8.gmail; Fri, 13 Mar 2020 03:29:25 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtAbw46HLEDjYE7qVDhjLMbR8AkLYLnwXYKYLGESiVbqxSsssK1EXyMRgLeB7s6x7UujrH0 X-Received: by 2002:a9d:7359:: with SMTP id l25mr10572174otk.18.1584095365916; Fri, 13 Mar 2020 03:29:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584095365; cv=none; d=google.com; s=arc-20160816; b=IxVd8a6gU9P9U/h3k5iSG1Dxzy+t36VqRHEbMyMnUs6pFRGeoe/jI0PexUwkY/TjK7 Ce2RQKfx27QxAOT8VqMh8gcy06TOtpaDrSuIQ6ILoyudb3/28Z9Z5RR8Uif1ffhsjbSi EU36i6Q56OZUlSTuqrEvwVQPAQ5IuyZptzhCLmQMpcdQYIT7p4j/1sdz3vwHRNPbuGf1 DsYK4k9AAwgHGE/EK2MFhBw6EaXfxw5yPLcBnnTmWT0JXMptwfm5bOegBtX5GOW4oU+9 sXeY9/obMda/bgQgeIvJzR+rOXoEiYNrQwv61Vw0fYGl5yOo7H5aJF4urChIIBhE0z3o aAWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:dkim-signature; bh=kqXMRjosvrMwbkpWYYUMv/eKp41LgZaQN2jfs/TMCUU=; b=D/oBcLJUQVbR4fae8O4E3wjo271Md86FSDdVGM9J2bURmFddnYQev6axJ5yNwdtXMd CZ2qHIsdabXxf8DFYbz7d9qJ6EEL6cfeOD6EL8vreoMPeUttm99pBTFg6H4eeaR2J9tc F/Zvh+qSoAsHSL+Kt+wlpOw7ypY4omx3FAv8E+5oR2I2t9H305RHTdhnIf/gQPpf7HQr k5IeHJ7pTiCUhFMIcx4oa7BTIZVLHMHPjYFuURi+H1dNtjTC8w+WWMEDka/NoRqRXpop SqF+pEVN2YlVzxArx1JjVnKovMwaN1iSHcyEBQqFaPpqr5ApEpjvCp3bV5TrOKEcFTeQ alJA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EWbg2LKq; spf=pass (google.com: domain of shreeya.patel23498@gmail.com designates 2607:f8b0:4864:20::641 as permitted sender) smtp.mailfrom=shreeya.patel23498@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com. [2607:f8b0:4864:20::641]) by gmr-mx.google.com with ESMTPS id b1si298095ots.2.2020.03.13.03.29.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Mar 2020 03:29:25 -0700 (PDT) Received-SPF: pass (google.com: domain of shreeya.patel23498@gmail.com designates 2607:f8b0:4864:20::641 as permitted sender) client-ip=2607:f8b0:4864:20::641; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EWbg2LKq; spf=pass (google.com: domain of shreeya.patel23498@gmail.com designates 2607:f8b0:4864:20::641 as permitted sender) smtp.mailfrom=shreeya.patel23498@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-pl1-x641.google.com with SMTP id g6so4052914plt.2 for ; Fri, 13 Mar 2020 03:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=kqXMRjosvrMwbkpWYYUMv/eKp41LgZaQN2jfs/TMCUU=; b=EWbg2LKqIyxcTZt54OZrlCbltZOHFk7QAr/BjENsjZfWl63N37tNSXyfPxxA0hTRu3 or4rZWujQhztrFqJsYFJUd8k74Q1F4Tqhf2S3hd6rGIxw40W28bThPpt6NfqCcHbHQWA 4FXoQ7Pd1UOft3mx57iVigFUPwH0cIsV5yat2JaHnEto1jFCq+jPPaepNxUksBrEPIid vY9b4GzJoo4MUSaptYYtogEF/CGnjXQOAaYUFXQZCP0VmpL2vY5j+nwNFN0guSeNqH7Z D+3voASXKTB12c7Rt0W6n1c5MEXIcUb0v8hC0Y4iv+tApge+jorRS2kNNs5Gpg95KcqX CtFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=kqXMRjosvrMwbkpWYYUMv/eKp41LgZaQN2jfs/TMCUU=; b=WgzrukXHKpCfzKu++RwYGS6dHcKhjf2HIzGopIyHox1nO11nQT51IPhI2XeDfOCs8D j2yIeLT/1RC8FxPFfKL+9UtBN89tejj4oQLd0IZQo5mXWRJ6yFLah3omVaiegK2Ek8JV 3/BEAsLs84MaliFjFhqOaB4dyVW2FfBRRXGQIak+Q42flfJMdgQ6RDZTJLxC31TTLqoW GN8+rmwGv7cWnBkVmWGKr/61jUMFbX3UKLuGwTp/dGLKomhXOfm9wS1JEAyscWCAz2Sx HbxyKPnM0GP0YWeO8/nBKhzvC8EBl+m1OV+sZi6S1mYeywabz2maK+AfAXd6rUZfC27S sPdw== X-Gm-Message-State: ANhLgQ34Io03VBvo7VJqaUe6qog49BsxUf5ZOJ1vIzc7XupdUh5/MEfG 3h7DYwkmTteIg70a44F8Vow= X-Received: by 2002:a17:902:7592:: with SMTP id j18mr12588240pll.180.1584095365090; Fri, 13 Mar 2020 03:29:25 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2405:204:22f:d418:f8a5:7ca8:f99b:fa30]) by smtp.gmail.com with ESMTPSA id u24sm55719326pgo.83.2020.03.13.03.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 03:29:24 -0700 (PDT) From: Shreeya Patel To: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com, sbrivio@redhat.com, daniel.baluta@gmail.com, nramas@linux.microsoft.com, hverkuil@xs4all.nl, shreeya.patel23498@gmail.com, Larry.Finger@lwfinger.net Subject: [Outreachy kernel] [PATCH v2] Staging: rtl8723bs: rtw_mlme: Remove unnecessary conditions Date: Fri, 13 Mar 2020 15:59:12 +0530 Message-Id: <20200313102912.17218-1-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.17.1 Remove unnecessary if and else conditions since both are leading to the initialization of "phtpriv->ampdu_enable" with the same value. Also, remove the unnecessary else-if condition since it does nothing. Signed-off-by: Shreeya Patel --- Changes in v2 - Remove unnecessary comments - Remove unnecessary else-if condition which does nothing. drivers/staging/rtl8723bs/core/rtw_mlme.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 71fcb466019a..d7a58af76ea0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2772,16 +2772,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe /* maybe needs check if ap supports rx ampdu. */ if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) { - if (pregistrypriv->wifi_spec == 1) { - /* remove this part because testbed AP should disable RX AMPDU */ - /* phtpriv->ampdu_enable = false; */ - phtpriv->ampdu_enable = true; - } else { - phtpriv->ampdu_enable = true; - } - } else if (pregistrypriv->ampdu_enable == 2) { - /* remove this part because testbed AP should disable RX AMPDU */ - /* phtpriv->ampdu_enable = true; */ + phtpriv->ampdu_enable = true; } /* check Max Rx A-MPDU Size */ -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25A97C4CECE for ; Fri, 13 Mar 2020 10:29:29 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E2B82073E for ; Fri, 13 Mar 2020 10:29:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EWbg2LKq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E2B82073E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CAA10204F4; Fri, 13 Mar 2020 10:29:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oIrWEHCEMu8a; Fri, 13 Mar 2020 10:29:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C37C42076B; Fri, 13 Mar 2020 10:29:27 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0E7C31BF349 for ; Fri, 13 Mar 2020 10:29:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0B5B386E25 for ; Fri, 13 Mar 2020 10:29:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sE4xfpKmMVay for ; Fri, 13 Mar 2020 10:29:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9949286E09 for ; Fri, 13 Mar 2020 10:29:25 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id d9so4029651plo.11 for ; Fri, 13 Mar 2020 03:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=kqXMRjosvrMwbkpWYYUMv/eKp41LgZaQN2jfs/TMCUU=; b=EWbg2LKqIyxcTZt54OZrlCbltZOHFk7QAr/BjENsjZfWl63N37tNSXyfPxxA0hTRu3 or4rZWujQhztrFqJsYFJUd8k74Q1F4Tqhf2S3hd6rGIxw40W28bThPpt6NfqCcHbHQWA 4FXoQ7Pd1UOft3mx57iVigFUPwH0cIsV5yat2JaHnEto1jFCq+jPPaepNxUksBrEPIid vY9b4GzJoo4MUSaptYYtogEF/CGnjXQOAaYUFXQZCP0VmpL2vY5j+nwNFN0guSeNqH7Z D+3voASXKTB12c7Rt0W6n1c5MEXIcUb0v8hC0Y4iv+tApge+jorRS2kNNs5Gpg95KcqX CtFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=kqXMRjosvrMwbkpWYYUMv/eKp41LgZaQN2jfs/TMCUU=; b=S2r9o5nrcpPXlyswbUp2dUXm9doGoZZVzKRQZ/jvuHqSl8Xlg+h/H67lHeJ5d0Pd6H N2S9Ge2YxO9vuwdAQN7nrbTnu5KCXcjgf62XvVEAmFbcRN0zF+LX8mvaCsZ9EvekqOW3 GXiAUXb0XTC7NDAFY7WvA+VlfdFH1vIGH/hFQOSROSxqKf7Ifc/jLzeQCYc6uCIoHo8T UQ9g0xgDaaLv+SeqSY4NeB5qCRdfVUFhnIbRzjpQBbTNQg8oyYkKDoXNcVhiqqaS7rvR tLQiCWd4qPkfvqH7jn5GzeqfJ4dYrlKJRtsxiCoPD0k4z+tOvNqFtPUdWcX4w8BjWgyb BR7w== X-Gm-Message-State: ANhLgQ3lWchk1KpuuEs95J3qYRkt/3PqO8xrqgQboKg5gNs2Yf1bd6km mldnD20z+2QztTr+b4DL1Ow= X-Google-Smtp-Source: ADFU+vsY8iYgbuRFlAd9U61nsaldOQC1hqGGqTzZvDEDjvVId3qGfnZZieGIXk2tsNLODrFDhDxEhQ== X-Received: by 2002:a17:902:7592:: with SMTP id j18mr12588240pll.180.1584095365090; Fri, 13 Mar 2020 03:29:25 -0700 (PDT) Received: from localhost.localdomain ([2405:204:22f:d418:f8a5:7ca8:f99b:fa30]) by smtp.gmail.com with ESMTPSA id u24sm55719326pgo.83.2020.03.13.03.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 03:29:24 -0700 (PDT) From: Shreeya Patel To: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com, sbrivio@redhat.com, daniel.baluta@gmail.com, nramas@linux.microsoft.com, hverkuil@xs4all.nl, shreeya.patel23498@gmail.com, Larry.Finger@lwfinger.net Subject: [Outreachy kernel] [PATCH v2] Staging: rtl8723bs: rtw_mlme: Remove unnecessary conditions Date: Fri, 13 Mar 2020 15:59:12 +0530 Message-Id: <20200313102912.17218-1-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" Remove unnecessary if and else conditions since both are leading to the initialization of "phtpriv->ampdu_enable" with the same value. Also, remove the unnecessary else-if condition since it does nothing. Signed-off-by: Shreeya Patel --- Changes in v2 - Remove unnecessary comments - Remove unnecessary else-if condition which does nothing. drivers/staging/rtl8723bs/core/rtw_mlme.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 71fcb466019a..d7a58af76ea0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2772,16 +2772,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe /* maybe needs check if ap supports rx ampdu. */ if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) { - if (pregistrypriv->wifi_spec == 1) { - /* remove this part because testbed AP should disable RX AMPDU */ - /* phtpriv->ampdu_enable = false; */ - phtpriv->ampdu_enable = true; - } else { - phtpriv->ampdu_enable = true; - } - } else if (pregistrypriv->ampdu_enable == 2) { - /* remove this part because testbed AP should disable RX AMPDU */ - /* phtpriv->ampdu_enable = true; */ + phtpriv->ampdu_enable = true; } /* check Max Rx A-MPDU Size */ -- 2.17.1 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel