On Wednesday, 11 March 2020 19:29:13 UTC+5:30, Shreeya Patel wrote:
Remove unnecessary if and else conditions since both are leading to the
initialization of "phtpriv->ampdu_enable" with the same value.

Signed-off-by: Shreeya Patel <shreeya....@gmail.com>
---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 71fcb466019a..48e9faf27321 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2772,13 +2772,9 @@ 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;
-                }
+                /* remove this part because testbed AP should disable RX AMPDU */
+                /* phtpriv->ampdu_enable = false; */
+                phtpriv->ampdu_enable = true;
         } else if (pregistrypriv->ampdu_enable == 2) {
                 /* remove this part because testbed AP should disable RX AMPDU */
                 /* phtpriv->ampdu_enable = true; */
--
2.17.1

 Juia, can you comment if the 2 commented lines [with '+' sign now] may also be removed to further simplify the code?

Deepak.