]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: rtl8723bs: fix spacing around operators in rtw_recv.c
authorKhasar Munkh-Erdene <02khasar@gmail.com>
Wed, 25 Feb 2026 03:29:09 +0000 (20:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Feb 2026 15:02:20 +0000 (07:02 -0800)
Fix coding style issues by adding missing spaces around binary and
ternary operators, as reported by checkpatch.pl.

Signed-off-by: Khasar Munkh-Erdene <02khasar@gmail.com>
Link: https://patch.msgid.link/20260225032909.72799-1-02khasar@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_recv.c

index beaadcaff967bf3ff6a744c4a1d0cf0a7babf1c5..1a52d3e1d285d77ac0f83e09ff4435a9a7efa0bb 100644 (file)
@@ -322,7 +322,7 @@ static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)
        } else {
                cur_time = jiffies;
 
-               if (cur_time - psecuritypriv->last_mic_err_time < 60*HZ) {
+               if (cur_time - psecuritypriv->last_mic_err_time < 60 * HZ) {
                        psecuritypriv->btkip_countermeasure = true;
                        psecuritypriv->last_mic_err_time = 0;
                        psecuritypriv->btkip_countermeasure_time = cur_time;
@@ -390,13 +390,13 @@ static signed int recvframe_chkmic(struct adapter *adapter,  union recv_frame *p
                                mickey = &stainfo->dot11tkiprxmickey.skey[0];
                        }
 
-                       datalen = precvframe->u.hdr.len-prxattrib->hdrlen-prxattrib->iv_len-prxattrib->icv_len-8;/* icv_len included the mic code */
+                       datalen = precvframe->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len - prxattrib->icv_len - 8;/* icv_len included the mic code */
                        pframe = precvframe->u.hdr.rx_data;
-                       payload = pframe+prxattrib->hdrlen+prxattrib->iv_len;
+                       payload = pframe + prxattrib->hdrlen + prxattrib->iv_len;
 
                        rtw_seccalctkipmic(mickey, pframe, payload, datalen, &miccode[0], (unsigned char)prxattrib->priority); /* care the length of the data */
 
-                       pframemic = payload+datalen;
+                       pframemic = payload + datalen;
 
                        bmic_err = false;
 
@@ -444,9 +444,9 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
        u32  res = _SUCCESS;
 
        if (prxattrib->encrypt > 0) {
-               u8 *iv = precv_frame->u.hdr.rx_data+prxattrib->hdrlen;
+               u8 *iv = precv_frame->u.hdr.rx_data + prxattrib->hdrlen;
 
-               prxattrib->key_index = (((iv[3])>>6)&0x3);
+               prxattrib->key_index = (((iv[3]) >> 6) & 0x3);
 
                if (prxattrib->key_index > WEP_KEYS) {
                        switch (prxattrib->encrypt) {
@@ -568,7 +568,7 @@ static signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct
 {
        signed int tid = precv_frame->u.hdr.attrib.priority;
 
-       u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
+       u16 seq_ctrl = ((precv_frame->u.hdr.attrib.seq_num & 0xffff) << 4) |
                (precv_frame->u.hdr.attrib.frag_num & 0xf);
 
        if (tid > 15)
@@ -632,29 +632,29 @@ static void process_wmmps_data(struct adapter *padapter, union recv_frame *precv
        if (!psta->qos_option)
                return;
 
-       if (!(psta->qos_info&0xf))
+       if (!(psta->qos_info & 0xf))
                return;
 
-       if (psta->state&WIFI_SLEEP_STATE) {
+       if (psta->state & WIFI_SLEEP_STATE) {
                u8 wmmps_ac = 0;
 
                switch (pattrib->priority) {
                case 1:
                case 2:
-                       wmmps_ac = psta->uapsd_bk&BIT(1);
+                       wmmps_ac = psta->uapsd_bk & BIT(1);
                        break;
                case 4:
                case 5:
-                       wmmps_ac = psta->uapsd_vi&BIT(1);
+                       wmmps_ac = psta->uapsd_vi & BIT(1);
                        break;
                case 6:
                case 7:
-                       wmmps_ac = psta->uapsd_vo&BIT(1);
+                       wmmps_ac = psta->uapsd_vo & BIT(1);
                        break;
                case 0:
                case 3:
                default:
-                       wmmps_ac = psta->uapsd_be&BIT(1);
+                       wmmps_ac = psta->uapsd_be & BIT(1);
                        break;
                }
 
@@ -979,20 +979,20 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_
                switch (pattrib->priority) {
                case 1:
                case 2:
-                       wmmps_ac = psta->uapsd_bk&BIT(0);
+                       wmmps_ac = psta->uapsd_bk & BIT(0);
                        break;
                case 4:
                case 5:
-                       wmmps_ac = psta->uapsd_vi&BIT(0);
+                       wmmps_ac = psta->uapsd_vi & BIT(0);
                        break;
                case 6:
                case 7:
-                       wmmps_ac = psta->uapsd_vo&BIT(0);
+                       wmmps_ac = psta->uapsd_vo & BIT(0);
                        break;
                case 0:
                case 3:
                default:
-                       wmmps_ac = psta->uapsd_be&BIT(0);
+                       wmmps_ac = psta->uapsd_be & BIT(0);
                        break;
                }
 
@@ -1004,7 +1004,7 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_
                        psta->state ^= WIFI_STA_ALIVE_CHK_STATE;
                }
 
-               if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid))) {
+               if ((psta->state & WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap & BIT(psta->aid))) {
                        struct list_head        *xmitframe_plist, *xmitframe_phead;
                        struct xmit_frame *pxmitframe = NULL;
                        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -1048,7 +1048,7 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_
                                /* spin_unlock_bh(&psta->sleep_q.lock); */
                                spin_unlock_bh(&pxmitpriv->lock);
 
-                               if (pstapriv->tim_bitmap&BIT(psta->aid)) {
+                               if (pstapriv->tim_bitmap & BIT(psta->aid)) {
                                        if (psta->sleepq_len == 0) {
                                                /* issue nulldata with More data bit = 0 to indicate we have no buffered packets */
                                                issue_nulldata_in_interrupt(padapter, psta->hwaddr);
@@ -1430,9 +1430,9 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame
                                goto validate_80211w_fail;
                        precv_frame = decryptor(adapter, precv_frame);
                        /* save actual management data frame body */
-                       memcpy(mgmt_DATA, ptr+pattrib->hdrlen+pattrib->iv_len, data_len);
+                       memcpy(mgmt_DATA, ptr + pattrib->hdrlen + pattrib->iv_len, data_len);
                        /* overwrite the iv field */
-                       memcpy(ptr+pattrib->hdrlen, mgmt_DATA, data_len);
+                       memcpy(ptr + pattrib->hdrlen, mgmt_DATA, data_len);
                        /* remove the iv and icv length */
                        pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len;
                        kfree(mgmt_DATA);
@@ -1488,7 +1488,7 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame
        struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
 
        u8 *ptr = precv_frame->u.hdr.rx_data;
-       u8  ver = (unsigned char) (*ptr)&0x3;
+       u8  ver = (unsigned char) (*ptr) & 0x3;
 
        /* add version chk */
        if (ver != 0) {
@@ -1526,7 +1526,7 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame
                retval = _FAIL; /*  only data frame return _SUCCESS */
                break;
        case WIFI_DATA_TYPE: /* data */
-               pattrib->qos = (subtype & BIT(7)) ? 1:0;
+               pattrib->qos = (subtype & BIT(7)) ? 1 : 0;
                retval = validate_recv_data_frame(adapter, precv_frame);
                if (retval == _FAIL) {
                        struct recv_priv *precvpriv = &adapter->recvpriv;
@@ -1571,8 +1571,8 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe)
        if (pattrib->encrypt)
                recvframe_pull_tail(precvframe, pattrib->icv_len);
 
-       psnap = (struct ieee80211_snap_hdr      *)(ptr+pattrib->hdrlen + pattrib->iv_len);
-       psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE;
+       psnap = (struct ieee80211_snap_hdr      *)(ptr + pattrib->hdrlen + pattrib->iv_len);
+       psnap_type = ptr + pattrib->hdrlen + pattrib->iv_len + SNAP_SIZE;
        /* convert hdr + possible LLC headers into Ethernet header */
        /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */
        if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) &&
@@ -1586,37 +1586,37 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe)
                /* Leave Ethernet header part of hdr and full payload */
                bsnaphdr = false;
 
-       rmv_len = pattrib->hdrlen + pattrib->iv_len + (bsnaphdr?SNAP_SIZE:0);
+       rmv_len = pattrib->hdrlen + pattrib->iv_len + (bsnaphdr ? SNAP_SIZE : 0);
        len = precvframe->u.hdr.len - rmv_len;
 
-       memcpy(&be_tmp, ptr+rmv_len, 2);
+       memcpy(&be_tmp, ptr + rmv_len, 2);
        eth_type = ntohs(be_tmp); /* pattrib->ether_type */
        pattrib->eth_type = eth_type;
 
        if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)) {
                ptr += rmv_len;
                *ptr = 0x87;
-               *(ptr+1) = 0x12;
+               *(ptr + 1) = 0x12;
 
                eth_type = 0x8712;
                /*  append rx status for mp test packets */
-               ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr)+2)-24);
+               ptr = recvframe_pull(precvframe, (rmv_len - sizeof(struct ethhdr) + 2) - 24);
                if (!ptr)
                        return _FAIL;
                memcpy(ptr, get_rxmem(precvframe), 24);
                ptr += 24;
        } else {
-               ptr = recvframe_pull(precvframe, (rmv_len-sizeof(struct ethhdr) + (bsnaphdr?2:0)));
+               ptr = recvframe_pull(precvframe, (rmv_len - sizeof(struct ethhdr) + (bsnaphdr ? 2 : 0)));
                if (!ptr)
                        return _FAIL;
        }
 
        memcpy(ptr, pattrib->dst, ETH_ALEN);
-       memcpy(ptr+ETH_ALEN, pattrib->src, ETH_ALEN);
+       memcpy(ptr + ETH_ALEN, pattrib->src, ETH_ALEN);
 
        if (!bsnaphdr) {
                be_tmp = htons(len);
-               memcpy(ptr+12, &be_tmp, 2);
+               memcpy(ptr + 12, &be_tmp, 2);
        }
 
        return _SUCCESS;
@@ -1754,7 +1754,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
                pdata += nSubframe_Length;
                a_len -= nSubframe_Length;
                if (a_len != 0) {
-                       padding_len = 4 - ((nSubframe_Length + ETH_HLEN) & (4-1));
+                       padding_len = 4 - ((nSubframe_Length + ETH_HLEN) & (4 - 1));
                        if (padding_len == 4)
                                padding_len = 0;
 
@@ -2004,7 +2004,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
 
                        rtw_recv_indicatepkt(padapter, prframe);
 
-                       preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
+                       preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096;
 
                        return _SUCCESS;
                }
@@ -2014,7 +2014,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
 
                        retval = amsdu_to_msdu(padapter, prframe);
 
-                       preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
+                       preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096;
 
                        return retval;
                }
@@ -2200,7 +2200,7 @@ static int recv_func(struct adapter *padapter, union recv_frame *rframe)
                        !psecuritypriv->busetkipkey) {
                        rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);
 
-                       if (recvpriv->free_recvframe_cnt < NR_RECVFRAME/4) {
+                       if (recvpriv->free_recvframe_cnt < NR_RECVFRAME / 4) {
                                /* to prevent from recvframe starvation, get recvframe from uc_swdec_pending_queue to free_recvframe_cnt  */
                                rframe = rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue);
                                if (rframe)
@@ -2289,19 +2289,19 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t)
                }
 
                /* update value of signal_strength, rssi, signal_qual */
-               tmp_s = (avg_signal_strength+(_alpha-1)*recvpriv->signal_strength);
+               tmp_s = (avg_signal_strength + (_alpha - 1) * recvpriv->signal_strength);
                if (tmp_s % _alpha)
-                       tmp_s = tmp_s/_alpha + 1;
+                       tmp_s = tmp_s / _alpha + 1;
                else
-                       tmp_s = tmp_s/_alpha;
+                       tmp_s = tmp_s / _alpha;
                if (tmp_s > 100)
                        tmp_s = 100;
 
-               tmp_q = (avg_signal_qual+(_alpha-1)*recvpriv->signal_qual);
+               tmp_q = (avg_signal_qual + (_alpha - 1) * recvpriv->signal_qual);
                if (tmp_q % _alpha)
-                       tmp_q = tmp_q/_alpha + 1;
+                       tmp_q = tmp_q / _alpha + 1;
                else
-                       tmp_q = tmp_q/_alpha;
+                       tmp_q = tmp_q / _alpha;
                if (tmp_q > 100)
                        tmp_q = 100;