From: Shreeya Patel Date: Fri, 13 Mar 2020 10:29:12 +0000 (+0530) Subject: Staging: rtl8723bs: rtw_mlme: Remove unnecessary conditions X-Git-Tag: v5.7-rc1~190^2~132 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af68516eb921dc7a9686402b3299c5d53869df1d;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Stefano Brivio Link: https://lore.kernel.org/r/20200313102912.17218-1-shreeya.patel23498@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 71fcb466019a9..d7a58af76ea0a 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 */