]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: rtl8188eu: cleanup missing spaces around operators
authorMichael Straube <straube.linux@gmail.com>
Thu, 11 Oct 2018 19:57:05 +0000 (21:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 Oct 2018 11:32:38 +0000 (13:32 +0200)
Clear all missing spaces around operators checkpatch issues
in the file core/rtw_xmit.c. Use '+=' or '-=' where possible.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_xmit.c

index fc06a13a6ea1bb34d6b511f44b4ff956175ff9f4..8336a72524405a71549a748206b5b9c58b11964a 100644 (file)
@@ -494,7 +494,8 @@ 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 (psta->qos_option)
                        set_qos(pkt, pattrib);
        } else {
@@ -628,15 +629,15 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                                rtw_secmicsetkey(&micdata, &stainfo->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);
@@ -653,23 +654,31 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                                payload = (u8 *)round_up((size_t)(payload), 4);
                                RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
                                         ("=== curfragnum=%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n",
-                                        curfragnum, *payload, *(payload+1),
-                                        *(payload+2), *(payload+3),
-                                        *(payload+4), *(payload+5),
-                                        *(payload+6), *(payload+7)));
+                                        curfragnum, *payload, *(payload + 1),
+                                        *(payload + 2), *(payload + 3),
+                                        *(payload + 4), *(payload + 5),
+                                        *(payload + 6), *(payload + 7)));
 
-                               payload = payload+pattrib->hdrlen+pattrib->iv_len;
+                               payload += pattrib->hdrlen + pattrib->iv_len;
                                RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
                                         ("curfragnum=%d pattrib->hdrlen=%d pattrib->iv_len=%d",
                                         curfragnum, 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 += 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 += length + pattrib->icv_len;
                                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("curfragnum=%d length=%d pattrib->icv_len=%d", curfragnum, length, pattrib->icv_len));
                                }
                        }
@@ -685,8 +694,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                        pattrib->last_txcmdsz += 8;
 
                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_, ("\n ======== last pkt ========\n"));
-                       payload = payload-pattrib->last_txcmdsz+8;
-                       for (curfragnum = 0; curfragnum < pattrib->last_txcmdsz; curfragnum = curfragnum+8)
+                       payload -= pattrib->last_txcmdsz + 8;
+                       for (curfragnum = 0; curfragnum < pattrib->last_txcmdsz; curfragnum += 8)
                                RT_TRACE(_module_rtl871x_xmit_c_, _drv_info_,
                                         (" %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x,  %.2x ",
                                         *(payload + curfragnum), *(payload + curfragnum + 1),
@@ -833,11 +842,11 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
                                if (SN_LESS(pattrib->seqnum, tx_seq)) {
                                        pattrib->ampdu_en = false;/* AGG BK */
                                } else if (SN_EQUAL(pattrib->seqnum, tx_seq)) {
-                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq+1)&0xfff;
+                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (tx_seq + 1) & 0xfff;
 
                                        pattrib->ampdu_en = true;/* AGG EN */
                                } else {
-                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff;
+                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum + 1) & 0xfff;
                                        pattrib->ampdu_en = true;/* AGG EN */
                                }
                        }
@@ -978,7 +987,10 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
 
                        RT_TRACE(_module_rtl871x_xmit_c_, _drv_notice_,
                                 ("%s: keyid=%d pattrib->iv[3]=%.2x pframe=%.2x %.2x %.2x %.2x\n",
-                                 __func__, padapter->securitypriv.dot11PrivacyKeyIndex, pattrib->iv[3], *pframe, *(pframe+1), *(pframe+2), *(pframe+3)));
+                                 __func__,
+                                 padapter->securitypriv.dot11PrivacyKeyIndex,
+                                 pattrib->iv[3], *pframe, *(pframe + 1),
+                                 *(pframe + 2), *(pframe + 3)));
 
                        pframe += pattrib->iv_len;
 
@@ -1118,7 +1130,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe,
        struct xmit_priv        *pxmitpriv = &padapter->xmitpriv;
        struct mlme_priv        *pmlmepriv = &padapter->mlmepriv;
 
-       if ((pxmitframe->frame_tag&0x0f) == DATA_FRAMETAG) {
+       if ((pxmitframe->frame_tag & 0x0f) == DATA_FRAMETAG) {
                pxmitpriv->tx_bytes += sz;
                pmlmepriv->LinkDetectInfo.NumTxOkInPeriod += pxmitframe->agg_num;
 
@@ -1673,10 +1685,10 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fra
 
        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)) {
+               if (pstapriv->sta_dz_bitmap & BIT(psta->aid)) {
                        list_del_init(&pxmitframe->list);
 
                        list_add_tail(&pxmitframe->list, get_list_head(&psta->sleep_q));
@@ -1860,7 +1872,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
 
                update_mask = BIT(0);
 
-               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) {
@@ -1878,7 +1890,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
        if (!psta_bmc)
                return;
 
-       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 */
                spin_lock_bh(&psta_bmc->sleep_q.lock);
 
                xmitframe_phead = get_list_head(&psta_bmc->sleep_q);