mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
staging: rtl8723bs: remove if (true) statement
'if (true) { ... }' will always evaluate to true. Remove it and save a few tabs for somewhere else. Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com> Link: https://lore.kernel.org/r/20210518144335.1677320-1-hello@bryanbrattlof.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
946c945301
commit
403e6946d1
1 changed files with 94 additions and 97 deletions
|
@ -59,112 +59,109 @@ static void update_BCNTIM(struct adapter *padapter)
|
|||
unsigned char *pie = pnetwork_mlmeext->IEs;
|
||||
|
||||
/* update TIM IE */
|
||||
/* if (pstapriv->tim_bitmap) */
|
||||
if (true) {
|
||||
u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
|
||||
__le16 tim_bitmap_le;
|
||||
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
|
||||
u8 *p, *dst_ie, *premainder_ie = NULL, *pbackup_remainder_ie = NULL;
|
||||
__le16 tim_bitmap_le;
|
||||
uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;
|
||||
|
||||
tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
|
||||
tim_bitmap_le = cpu_to_le16(pstapriv->tim_bitmap);
|
||||
|
||||
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_,
|
||||
WLAN_EID_TIM,
|
||||
&tim_ielen,
|
||||
pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_
|
||||
p = rtw_get_ie(pie + _FIXED_IE_LENGTH_,
|
||||
WLAN_EID_TIM,
|
||||
&tim_ielen,
|
||||
pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_
|
||||
);
|
||||
if (p && tim_ielen > 0) {
|
||||
tim_ielen += 2;
|
||||
|
||||
premainder_ie = p + tim_ielen;
|
||||
|
||||
tim_ie_offset = (signed int)(p - pie);
|
||||
|
||||
remainder_ielen = pnetwork_mlmeext->IELength - tim_ie_offset - tim_ielen;
|
||||
|
||||
/* append TIM IE from dst_ie offset */
|
||||
dst_ie = p;
|
||||
} else {
|
||||
tim_ielen = 0;
|
||||
|
||||
/* calculate head_len */
|
||||
offset = _FIXED_IE_LENGTH_;
|
||||
|
||||
/* get ssid_ie len */
|
||||
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_,
|
||||
WLAN_EID_SSID,
|
||||
&tmp_len,
|
||||
(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)
|
||||
);
|
||||
if (p && tim_ielen > 0) {
|
||||
tim_ielen += 2;
|
||||
if (p)
|
||||
offset += tmp_len + 2;
|
||||
|
||||
premainder_ie = p + tim_ielen;
|
||||
/* get supported rates len */
|
||||
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_,
|
||||
WLAN_EID_SUPP_RATES, &tmp_len,
|
||||
(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)
|
||||
);
|
||||
if (p)
|
||||
offset += tmp_len + 2;
|
||||
|
||||
tim_ie_offset = (signed int)(p - pie);
|
||||
/* DS Parameter Set IE, len =3 */
|
||||
offset += 3;
|
||||
|
||||
remainder_ielen = pnetwork_mlmeext->IELength - tim_ie_offset - tim_ielen;
|
||||
premainder_ie = pie + offset;
|
||||
|
||||
/* append TIM IE from dst_ie offset */
|
||||
dst_ie = p;
|
||||
} else {
|
||||
tim_ielen = 0;
|
||||
remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen;
|
||||
|
||||
/* calculate head_len */
|
||||
offset = _FIXED_IE_LENGTH_;
|
||||
|
||||
/* get ssid_ie len */
|
||||
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_,
|
||||
WLAN_EID_SSID,
|
||||
&tmp_len,
|
||||
(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)
|
||||
);
|
||||
if (p)
|
||||
offset += tmp_len + 2;
|
||||
|
||||
/* get supported rates len */
|
||||
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_,
|
||||
WLAN_EID_SUPP_RATES, &tmp_len,
|
||||
(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)
|
||||
);
|
||||
if (p)
|
||||
offset += tmp_len + 2;
|
||||
|
||||
/* DS Parameter Set IE, len =3 */
|
||||
offset += 3;
|
||||
|
||||
premainder_ie = pie + offset;
|
||||
|
||||
remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen;
|
||||
|
||||
/* append TIM IE from offset */
|
||||
dst_ie = pie + offset;
|
||||
}
|
||||
|
||||
if (remainder_ielen > 0) {
|
||||
pbackup_remainder_ie = rtw_malloc(remainder_ielen);
|
||||
if (pbackup_remainder_ie && premainder_ie)
|
||||
memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
|
||||
}
|
||||
|
||||
*dst_ie++ = WLAN_EID_TIM;
|
||||
|
||||
if ((pstapriv->tim_bitmap & 0xff00) && (pstapriv->tim_bitmap & 0x00fe))
|
||||
tim_ielen = 5;
|
||||
else
|
||||
tim_ielen = 4;
|
||||
|
||||
*dst_ie++ = tim_ielen;
|
||||
|
||||
*dst_ie++ = 0;/* DTIM count */
|
||||
*dst_ie++ = 1;/* DTIM period */
|
||||
|
||||
if (pstapriv->tim_bitmap & BIT(0))/* for bc/mc frames */
|
||||
*dst_ie++ = BIT(0);/* bitmap ctrl */
|
||||
else
|
||||
*dst_ie++ = 0;
|
||||
|
||||
if (tim_ielen == 4) {
|
||||
__le16 pvb;
|
||||
|
||||
if (pstapriv->tim_bitmap & 0xff00)
|
||||
pvb = cpu_to_le16(pstapriv->tim_bitmap >> 8);
|
||||
else
|
||||
pvb = tim_bitmap_le;
|
||||
|
||||
*dst_ie++ = le16_to_cpu(pvb);
|
||||
|
||||
} else if (tim_ielen == 5) {
|
||||
memcpy(dst_ie, &tim_bitmap_le, 2);
|
||||
dst_ie += 2;
|
||||
}
|
||||
|
||||
/* copy remainder IE */
|
||||
if (pbackup_remainder_ie) {
|
||||
memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
|
||||
|
||||
kfree(pbackup_remainder_ie);
|
||||
}
|
||||
|
||||
offset = (uint)(dst_ie - pie);
|
||||
pnetwork_mlmeext->IELength = offset + remainder_ielen;
|
||||
/* append TIM IE from offset */
|
||||
dst_ie = pie + offset;
|
||||
}
|
||||
|
||||
if (remainder_ielen > 0) {
|
||||
pbackup_remainder_ie = rtw_malloc(remainder_ielen);
|
||||
if (pbackup_remainder_ie && premainder_ie)
|
||||
memcpy(pbackup_remainder_ie, premainder_ie, remainder_ielen);
|
||||
}
|
||||
|
||||
*dst_ie++ = WLAN_EID_TIM;
|
||||
|
||||
if ((pstapriv->tim_bitmap & 0xff00) && (pstapriv->tim_bitmap & 0x00fe))
|
||||
tim_ielen = 5;
|
||||
else
|
||||
tim_ielen = 4;
|
||||
|
||||
*dst_ie++ = tim_ielen;
|
||||
|
||||
*dst_ie++ = 0;/* DTIM count */
|
||||
*dst_ie++ = 1;/* DTIM period */
|
||||
|
||||
if (pstapriv->tim_bitmap & BIT(0))/* for bc/mc frames */
|
||||
*dst_ie++ = BIT(0);/* bitmap ctrl */
|
||||
else
|
||||
*dst_ie++ = 0;
|
||||
|
||||
if (tim_ielen == 4) {
|
||||
__le16 pvb;
|
||||
|
||||
if (pstapriv->tim_bitmap & 0xff00)
|
||||
pvb = cpu_to_le16(pstapriv->tim_bitmap >> 8);
|
||||
else
|
||||
pvb = tim_bitmap_le;
|
||||
|
||||
*dst_ie++ = le16_to_cpu(pvb);
|
||||
|
||||
} else if (tim_ielen == 5) {
|
||||
memcpy(dst_ie, &tim_bitmap_le, 2);
|
||||
dst_ie += 2;
|
||||
}
|
||||
|
||||
/* copy remainder IE */
|
||||
if (pbackup_remainder_ie) {
|
||||
memcpy(dst_ie, pbackup_remainder_ie, remainder_ielen);
|
||||
|
||||
kfree(pbackup_remainder_ie);
|
||||
}
|
||||
|
||||
offset = (uint)(dst_ie - pie);
|
||||
pnetwork_mlmeext->IELength = offset + remainder_ielen;
|
||||
}
|
||||
|
||||
u8 chk_sta_is_alive(struct sta_info *psta);
|
||||
|
|
Loading…
Reference in a new issue