staging: r8188eu: remove unconditional if statement
A message that is not in the archive (sent off-list or not yet received): 20220215023926.GA52339.ref@snoopy
PATCH 1/1 staging: r8188eu: remove unconditional if statement
Remove if condition that is always true. It is useless and makes the code less readable.
Signed-off-by Marcelo Aloisio da Silva <[email protected]>
--- drivers/staging/r8188eu/core/rtw_ap.c | 124 +++++++++++++------------- 1 file changed, 62 insertions(+), 62 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +62 -62
@@ -55,85 +55,85 @@ static void update_BCNTIM(struct adapter *padapter)struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;unsigned char *pie = pnetwork_mlmeext->IEs; +u8 *p, *dst_ie, *premainder_ie =NULL ; +u8 *pbackup_remainder_ie =NULL ; +__le16 tim_bitmap_le; +uint offset, tmp_len, tim_ielen, tim_ie_offset, remainder_ielen;/* update TIM IE */ -if (true) { -u8 *p, *dst_ie, *premainder_ie =NULL ; -u8 *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); - - p =rtw_get_ie (pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_); -if (p && tim_ielen >0 ) { - tim_ielen +=2 ; - premainder_ie = p + tim_ielen; - tim_ie_offset = (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_; - offset += pnetwork_mlmeext->Ssid.SsidLength +2 ; + p =rtw_get_ie (pie + _FIXED_IE_LENGTH_, _TIM_IE_, &tim_ielen, + pnetwork_mlmeext->IELength - _FIXED_IE_LENGTH_); +if (p && tim_ielen >0 ) { + tim_ielen +=2 ; + premainder_ie = p + tim_ielen; + tim_ie_offset = (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 ; -/* get supported rates len */ - p =rtw_get_ie (pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)); -if (p) - offset += tmp_len +2 ; +/* calculate head_len */ + offset = _FIXED_IE_LENGTH_; + offset += pnetwork_mlmeext->Ssid.SsidLength +2 ; -/* DS Parameter Set IE, len = 3 */ - offset +=3 ; +/* get supported rates len */ + p =rtw_get_ie (pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, + &tmp_len, (pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)); +if (p) + offset += tmp_len +2 ; - premainder_ie = pie + offset; +/* DS Parameter Set IE, len = 3 */ + offset +=3 ; - remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen; + premainder_ie = pie + offset; -/* append TIM IE from offset */ - dst_ie = pie + offset; - } + remainder_ielen = pnetwork_mlmeext->IELength - offset - tim_ielen; -if (remainder_ielen >0 ) { - pbackup_remainder_ie =kmalloc (remainder_ielen,GFP_ATOMIC ); -if (pbackup_remainder_ie && premainder_ie) -memcpy (pbackup_remainder_ie, premainder_ie, remainder_ielen); - } - *dst_ie++ = _TIM_IE_; +/* append TIM IE from offset */ + dst_ie = pie + offset; + } -if ((pstapriv->tim_bitmap &0xff00 ) && (pstapriv->tim_bitmap &0x00fc )) - tim_ielen =5 ; -else - tim_ielen =4 ; +if (remainder_ielen >0 ) { + pbackup_remainder_ie =kmalloc (remainder_ielen,GFP_ATOMIC ); +if (pbackup_remainder_ie && premainder_ie) +memcpy (pbackup_remainder_ie, premainder_ie, remainder_ielen); + } + *dst_ie++ = _TIM_IE_; - *dst_ie++ = tim_ielen; +if ((pstapriv->tim_bitmap &0xff00 ) && (pstapriv->tim_bitmap &0x00fc )) + tim_ielen =5 ; +else + tim_ielen =4 ; - *dst_ie++ =0 ;/* DTIM count */ - *dst_ie++ =1 ;/* DTIM period */ + *dst_ie++ = tim_ielen; -if (pstapriv->tim_bitmap &BIT (0 ))/* for bc/mc frames */ - *dst_ie++ =BIT (0 );/* bitmap ctrl */ -else - *dst_ie++ =0 ; + *dst_ie++ =0 ;/* DTIM count */ + *dst_ie++ =1 ;/* DTIM period */ -if (tim_ielen ==4 ) { - *dst_ie++ = *(u8 *)&tim_bitmap_le; - }else if (tim_ielen ==5 ) { -memcpy (dst_ie, &tim_bitmap_le,2 ); - dst_ie +=2 ; - } +if (pstapriv->tim_bitmap &BIT (0 ))/* for bc/mc frames */ + *dst_ie++ =BIT (0 );/* bitmap ctrl */ +else + *dst_ie++ =0 ; -/* copy remainder IE */ -if (pbackup_remainder_ie) { -memcpy (dst_ie, pbackup_remainder_ie, remainder_ielen); + tim_bitmap_le =cpu_to_le16 (pstapriv->tim_bitmap); -kfree (pbackup_remainder_ie); - } - offset = (uint)(dst_ie - pie); - pnetwork_mlmeext->IELength = offset + remainder_ielen; +if (tim_ielen ==4 ) { + *dst_ie++ = *(u8 *)&tim_bitmap_le; + }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;set_tx_beacon_cmd (padapter); }
Signature · 1 line
2.25.1