Staging: rtl8723bs: rtw_mlme: Remove unnecessary conditions

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 <shreeya.patel23498@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Link: https://lore.kernel.org/r/20200313102912.17218-1-shreeya.patel23498@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 71fcb46..d7a58af 100644 (file)
--- 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 */