]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: rtl8723bs: fix operator and type cast spacing
authorKhushal Chitturi <khushalchitturi@gmail.com>
Fri, 16 Jan 2026 05:30:49 +0000 (11:00 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 16 Jan 2026 13:12:16 +0000 (14:12 +0100)
Fix spacing around operators and type casts in rtw_xmit.c to
comply with the kernel coding style.

Signed-off-by: Khushal Chitturi <khushalchitturi@gmail.com>
Link: https://patch.msgid.link/20260116053052.4198-2-khushalchitturi@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_xmit.c

index 7aaef2cbc9ac63267b11a02c8d51e9fb26467f78..9cead1455bfae1eaf5e490266c5fccf1f06e23be 100644 (file)
@@ -78,7 +78,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
        }
        pxmitpriv->pxmit_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv->pallocated_frame_buf), 4);
 
-       pxframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf;
+       pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;
 
        for (i = 0; i < NR_XMITFRAME; i++) {
                INIT_LIST_HEAD(&pxframe->list);
@@ -238,7 +238,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
                        pxmitbuf->padapter = padapter;
                        pxmitbuf->buf_tag = XMITBUF_CMD;
 
-                       res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_CMDBUF_SZ+XMITBUF_ALIGN_SZ, true);
+                       res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf,
+                                                        MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ,
+                                                        true);
                        if (res == _FAIL) {
                                res = _FAIL;
                                goto exit;
@@ -248,7 +250,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
                        pxmitbuf->pend = pxmitbuf->pbuf + MAX_CMDBUF_SZ;
                        pxmitbuf->len = 0;
                        pxmitbuf->pdata = pxmitbuf->ptail = pxmitbuf->phead;
-                       pxmitbuf->alloc_sz = MAX_CMDBUF_SZ+XMITBUF_ALIGN_SZ;
+                       pxmitbuf->alloc_sz = MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ;
                }
        }
 
@@ -274,7 +276,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
 {
        int i;
        struct adapter *padapter = pxmitpriv->adapter;
-       struct xmit_frame       *pxmitframe = (struct xmit_frame *) pxmitpriv->pxmit_frame_buf;
+       struct xmit_frame       *pxmitframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;
        struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
 
        rtw_hal_free_xmit_priv(padapter);
@@ -321,7 +323,9 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
        for (i = 0; i < CMDBUF_MAX; i++) {
                pxmitbuf = &pxmitpriv->pcmd_xmitbuf[i];
                if (pxmitbuf)
-                       rtw_os_xmit_resource_free(padapter, pxmitbuf, MAX_CMDBUF_SZ+XMITBUF_ALIGN_SZ, true);
+                       rtw_os_xmit_resource_free(padapter, pxmitbuf,
+                                                 MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ,
+                                                 true);
        }
 
        rtw_free_hwxmits(padapter);
@@ -737,7 +741,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
        pattrib->subtype = WIFI_DATA_TYPE;
        pattrib->priority = 0;
 
-       if (check_fwstate(pmlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE)) {
+       if (check_fwstate(pmlmepriv, WIFI_AP_STATE | WIFI_ADHOC_STATE | WIFI_ADHOC_MASTER_STATE)) {
                if (pattrib->qos_en)
                        set_qos(&pktfile, pattrib);
        } else {
@@ -788,15 +792,15 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                                rtw_secmicsetkey(&micdata, &pattrib->dot11tkiptxmickey.skey[0]);
                        }
 
-                       if (pframe[1]&1) {   /* ToDS == 1 */
+                       if (pframe[1] & 1) {   /* ToDS == 1 */
                                rtw_secmicappend(&micdata, &pframe[16], 6);  /* DA */
-                               if (pframe[1]&2)  /* From Ds == 1 */
+                               if (pframe[1] & 2)  /* From Ds == 1 */
                                        rtw_secmicappend(&micdata, &pframe[24], 6);
                                else
                                        rtw_secmicappend(&micdata, &pframe[10], 6);
                        } else {        /* ToDS == 0 */
                                rtw_secmicappend(&micdata, &pframe[4], 6);   /* DA */
-                               if (pframe[1]&2)  /* From Ds == 1 */
+                               if (pframe[1] & 2)  /* From Ds == 1 */
                                        rtw_secmicappend(&micdata, &pframe[16], 6);
                                else
                                        rtw_secmicappend(&micdata, &pframe[10], 6);
@@ -811,16 +815,20 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
 
                        for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
                                payload = (u8 *)round_up((SIZE_PTR)(payload), 4);
-                               payload = payload+pattrib->hdrlen+pattrib->iv_len;
+                               payload = payload + pattrib->hdrlen + pattrib->iv_len;
 
-                               if ((curfragnum+1) == pattrib->nr_frags) {
-                                       length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-((pattrib->bswenc) ? pattrib->icv_len : 0);
+                               if ((curfragnum + 1) == pattrib->nr_frags) {
+                                       length = pattrib->last_txcmdsz - pattrib->hdrlen -
+                                                pattrib->iv_len -
+                                                ((pattrib->bswenc) ? pattrib->icv_len : 0);
                                        rtw_secmicappend(&micdata, payload, length);
-                                       payload = payload+length;
+                                       payload = payload + length;
                                } else {
-                                       length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-((pattrib->bswenc) ? pattrib->icv_len : 0);
+                                       length = pxmitpriv->frag_len - pattrib->hdrlen -
+                                                pattrib->iv_len -
+                                                ((pattrib->bswenc) ? pattrib->icv_len : 0);
                                        rtw_secmicappend(&micdata, payload, length);
-                                       payload = payload+length+pattrib->icv_len;
+                                       payload = payload + length + pattrib->icv_len;
                                }
                        }
                        rtw_secgetmic(&micdata, &mic[0]);
@@ -1109,8 +1117,10 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
                if (bmcst || (rtw_endofpktfile(&pktfile) == true)) {
                        pattrib->nr_frags = frg_inx;
 
-                       pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len + ((pattrib->nr_frags == 1) ? llc_sz:0) +
-                                       ((pattrib->bswenc) ? pattrib->icv_len : 0) + mem_sz;
+                       pattrib->last_txcmdsz = pattrib->hdrlen + pattrib->iv_len +
+                                               ((pattrib->nr_frags == 1) ? llc_sz : 0) +
+                                               ((pattrib->bswenc) ? pattrib->icv_len : 0) +
+                                               mem_sz;
 
                        ClearMFrag(mem_start);
 
@@ -1159,7 +1169,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
        mem_start = pframe = (u8 *)(pxmitframe->buf_addr) + TXDESC_OFFSET;
        pwlanhdr = (struct ieee80211_hdr *)pframe;
 
-       ori_len = BIP_AAD_SIZE+pattrib->pktlen;
+       ori_len = BIP_AAD_SIZE + pattrib->pktlen;
        tmp_buf = BIP_AAD = rtw_zmalloc(ori_len);
        subtype = GetFrameSubType(pframe); /* bit(7)~bit(2) */
 
@@ -1212,14 +1222,14 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
                /* conscruct AAD, copy address 1 to address 3 */
                memcpy(BIP_AAD + 2, &pwlanhdr->addrs, sizeof(pwlanhdr->addrs));
                /* copy management fram body */
-               memcpy(BIP_AAD+BIP_AAD_SIZE, MGMT_body, frame_body_len);
+               memcpy(BIP_AAD + BIP_AAD_SIZE, MGMT_body, frame_body_len);
                /* calculate mic */
                if (omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->securitypriv.dot11wBIPKeyid].skey
-                       , BIP_AAD, BIP_AAD_SIZE+frame_body_len, mic))
+                       , BIP_AAD, BIP_AAD_SIZE + frame_body_len, mic))
                        goto xmitframe_coalesce_fail;
 
                /* copy right BIP mic value, total is 128bits, we use the 0~63 bits */
-               memcpy(pframe-8, mic, 8);
+               memcpy(pframe - 8, mic, 8);
        } else { /* unicast mgmt frame TX */
                /* start to encrypt mgmt frame */
                if (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC ||
@@ -1268,9 +1278,10 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
                        memcpy(pframe, pattrib->iv, pattrib->iv_len);
                        pframe += pattrib->iv_len;
                        /* copy mgmt data portion after CCMP header */
-                       memcpy(pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen);
+                       memcpy(pframe, tmp_buf + pattrib->hdrlen,
+                              pattrib->pktlen - pattrib->hdrlen);
                        /* move pframe to end of mgmt pkt */
-                       pframe += pattrib->pktlen-pattrib->hdrlen;
+                       pframe += pattrib->pktlen - pattrib->hdrlen;
                        /* add 8 bytes CCMP IV header to length */
                        pattrib->pktlen += pattrib->iv_len;
                        if ((pattrib->icv_len > 0) && (pattrib->bswenc)) {
@@ -1376,7 +1387,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        u8 pkt_num = 1;
 
-       if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) {
+       if ((pxmitframe->frame_tag & 0x0f) == DATA_FRAMETAG) {
                pkt_num = pxmitframe->agg_num;
 
                pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pkt_num;
@@ -2069,7 +2080,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct x
 
        spin_lock_bh(&psta->sleep_q.lock);
 
-       if (psta->state&WIFI_SLEEP_STATE) {
+       if (psta->state & WIFI_SLEEP_STATE) {
                u8 wmmps_ac = 0;
 
                if (pstapriv->sta_dz_bitmap & BIT(psta->aid)) {
@@ -2082,20 +2093,20 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct x
                        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;
                        }
 
@@ -2213,20 +2224,20 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
                switch (pxmitframe->attrib.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;
                }
 
@@ -2258,7 +2269,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
 
                pstapriv->tim_bitmap &= ~BIT(psta->aid);
 
-               if (psta->state&WIFI_SLEEP_STATE)
+               if (psta->state & WIFI_SLEEP_STATE)
                        psta->state ^= WIFI_SLEEP_STATE;
 
                if (psta->state & WIFI_STA_ALIVE_CHK_STATE) {
@@ -2273,7 +2284,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
        if (!psta_bmc)
                goto _exit;
 
-       if ((pstapriv->sta_dz_bitmap&0xfffe) == 0x0) { /* no any sta in ps mode */
+       if ((pstapriv->sta_dz_bitmap & 0xfffe) == 0x0) { /* no any sta in ps mode */
                xmitframe_phead = get_list_head(&psta_bmc->sleep_q);
                list_for_each_safe(xmitframe_plist, tmp, xmitframe_phead) {
                        pxmitframe = list_entry(xmitframe_plist,
@@ -2326,20 +2337,20 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst
                switch (pxmitframe->attrib.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;
                }