Messages in this thread | | | Date | Sun, 15 Mar 2020 22:27:23 +0100 | From | Stefano Brivio <> | Subject | Re: [Outreachy kernel] [PATCH v2] Staging: rtl8723bs: rtw_mlme: Remove unnecessary conditions |
| |
On Fri, 13 Mar 2020 15:59:12 +0530 Shreeya Patel <shreeya.patel23498@gmail.com> wrote:
> 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> > --- > > 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;
I suspect this is actually a bug, that is:
os_dep/os_intfs.c:74:static int rtw_ampdu_enable = 1;/* for enable tx_ampdu ,0: disable, 0x1:enable (but wifi_spec should be 0), 0x2: force enable (don't care wifi_spec) */
and that seems to actually map to the ampdu_enable field in pregistrypriv.
However, I wouldn't change this without testing it on the actual hardware, change looks good to me and doesn't affect functionality,
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
-- Stefano
| |