staging: rtl8723bs: Remove multiple blank lines
authorJavier F. Arias <jarias.linux@gmail.com>
Tue, 12 Nov 2019 16:53:01 +0000 (11:53 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Nov 2019 23:04:53 +0000 (00:04 +0100)
This patch removes multiple blank lines to solve the warning found by
checkpatch.

Signed-off-by: Javier F. Arias <jarias.linux@gmail.com>
Link: https://lore.kernel.org/r/257b08ad13aa23c2ee53fc333ea3c3f7e3105791.1573577309.git.jarias.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_xmit.c

index a4eec81..e10e2d7 100644 (file)
@@ -25,7 +25,6 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv)
 
        spin_lock_init(&psta_xmitpriv->lock);
 
-
        _init_txservq(&psta_xmitpriv->be_q);
        _init_txservq(&psta_xmitpriv->bk_q);
        _init_txservq(&psta_xmitpriv->vi_q);
@@ -52,14 +51,12 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
 
        pxmitpriv->adapter = padapter;
 
-
        _rtw_init_queue(&pxmitpriv->be_pending);
        _rtw_init_queue(&pxmitpriv->bk_pending);
        _rtw_init_queue(&pxmitpriv->vi_pending);
        _rtw_init_queue(&pxmitpriv->vo_pending);
        _rtw_init_queue(&pxmitpriv->bm_pending);
 
-
        _rtw_init_queue(&pxmitpriv->free_xmit_queue);
 
        /*
@@ -101,7 +98,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
 
        pxmitpriv->frag_len = MAX_FRAG_THRESHOLD;
 
-
        /* init xmit_buf */
        _rtw_init_queue(&pxmitpriv->free_xmitbuf_queue);
        _rtw_init_queue(&pxmitpriv->pending_xmitbuf_queue);
@@ -300,7 +296,6 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv)
        if (pxmitpriv->pallocated_frame_buf)
                vfree(pxmitpriv->pallocated_frame_buf);
 
-
        if (pxmitpriv->pallocated_xmitbuf)
                vfree(pxmitpriv->pallocated_xmitbuf);
 
@@ -398,7 +393,6 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
                                break;
                        }
 
-
                        /* check ERP protection */
                        if (pattrib->rtsen || pattrib->cts2self) {
                                if (pattrib->rtsen)
@@ -479,8 +473,6 @@ static void update_attrib_phy_info(struct adapter *padapter, struct pkt_attrib *
        else
                pattrib->ampdu_spacing = psta->htpriv.rx_ampdu_min_spacing;
 
-
-
        pattrib->retry_ctrl = false;
 
 #ifdef CONFIG_AUTO_AP_MODE
@@ -565,7 +557,6 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p
                else
                        TKIP_IV(pattrib->iv, psta->dot11txpn, 0);
 
-
                memcpy(pattrib->dot11tkiptxmickey.skey, psta->dot11tkiptxmickey.skey, 16);
 
                break;
@@ -647,7 +638,6 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
        struct iphdr ip_hdr;
        s32 UserPriority = 0;
 
-
        _rtw_open_pktfile(ppktfile->pkt, ppktfile);
        _rtw_pktfile_read(ppktfile, (unsigned char *)&etherhdr, ETH_HLEN);
 
@@ -680,11 +670,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
 
        pattrib->ether_type = ntohs(etherhdr.h_proto);
 
-
        memcpy(pattrib->dst, &etherhdr.h_dest, ETH_ALEN);
        memcpy(pattrib->src, &etherhdr.h_source, ETH_ALEN);
 
-
        if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true) ||
                (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true)) {
                memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
@@ -736,7 +724,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
                        }
                }
 
-
        } else if (0x888e == pattrib->ether_type) {
                DBG_871X_LEVEL(_drv_always_, "send eapol packet\n");
        }
@@ -791,8 +778,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
                return _FAIL;
        }
 
-
-
        /* TODO:_lock */
        if (update_attrib_sec_info(padapter, pattrib, psta) == _FAIL) {
                DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_err_sec);
@@ -802,7 +787,6 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib
 
        update_attrib_phy_info(padapter, pattrib, psta);
 
-
        pattrib->psta = psta;
        /* TODO:_unlock */
 
@@ -847,7 +831,6 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
        u8 hw_hdr_offset = 0;
        sint bmcst = IS_MCAST(pattrib->ra);
 
-
        hw_hdr_offset = TXDESC_OFFSET;
 
        if (pattrib->encrypt == _TKIP_) {
@@ -889,7 +872,6 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
                        if (pattrib->qos_en)
                                priority[0] = (u8)pxmitframe->attrib.priority;
 
-
                        rtw_secmicappend(&micdata, &priority[0], 4);
 
                        payload = pframe;
@@ -1056,7 +1038,6 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
                                return _FAIL;
                        }
 
-
                        if (psta) {
                                psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
                                psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF;
@@ -1069,7 +1050,6 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
                                        if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
                                                pattrib->ampdu_en = true;
 
-
                                /* re-check if enable ampdu by BA_starting_seqctrl */
                                if (pattrib->ampdu_en == true) {
                                        u16 tx_seq;
@@ -1218,7 +1198,6 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_fram
                        mpdu_len -= pattrib->icv_len;
                }
 
-
                if (bmcst) {
                        /*  don't do fragment to broadcat/multicast packets */
                        mem_sz = _rtw_pktfile_read(&pktfile, pframe, pattrib->pktlen);
@@ -1618,7 +1597,6 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
                DBG_871X("DBG_XMIT_BUF_EXT ALLOC no =%d,  free_xmit_extbuf_cnt =%d\n", pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt);
                #endif
 
-
                pxmitbuf->priv_data = NULL;
 
                pxmitbuf->len = 0;
@@ -1667,7 +1645,6 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
        struct list_head *plist, *phead;
        struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
 
-
        spin_lock_irqsave(&pfree_xmitbuf_queue->lock, irqL);
 
        if (list_empty(&pfree_xmitbuf_queue->queue)) {
@@ -1716,7 +1693,6 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
        _irqL irqL;
        struct __queue *pfree_xmitbuf_queue = &pxmitpriv->free_xmitbuf_queue;
 
-
        if (!pxmitbuf)
                return _FAIL;
 
@@ -2006,7 +1982,6 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
 
        DBG_COUNTER(padapter->tx_logs.core_tx_enqueue_class);
 
-
        psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
        if (pattrib->psta != psta) {
                DBG_COUNTER(padapter->tx_logs.core_tx_enqueue_class_err_sta);
@@ -2030,18 +2005,14 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
 
        ptxservq = rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8 *)(&ac_index));
 
-
        if (list_empty(&ptxservq->tx_pending)) {
                list_add_tail(&ptxservq->tx_pending, get_list_head(phwxmits[ac_index].sta_queue));
        }
 
-
        list_add_tail(&pxmitframe->list, get_list_head(&ptxservq->sta_pending));
        ptxservq->qcnt++;
        phwxmits[ac_index].accnt++;
 
-
-
 exit:
 
        return res;
@@ -2296,7 +2267,6 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
                return ret;
        }
 
-
        if (bmcst) {
                spin_lock_bh(&psta->sleep_q.lock);
 
@@ -2305,7 +2275,6 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
 
                        list_del_init(&pxmitframe->list);
 
-
                        list_add_tail(&pxmitframe->list, get_list_head(&psta->sleep_q));
 
                        psta->sleepq_len++;
@@ -2316,14 +2285,12 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
                        pstapriv->tim_bitmap |= BIT(0);
                        pstapriv->sta_dz_bitmap |= BIT(0);
 
-
                        if (update_tim) {
                                update_beacon(padapter, _TIM_IE_, NULL, true);
                        } else {
                                chk_bmc_sleepq_cmd(padapter);
                        }
 
-
                        ret = true;
 
                        DBG_COUNTER(padapter->tx_logs.core_tx_ap_enqueue_mcast);
@@ -2336,7 +2303,6 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
 
        }
 
-
        spin_lock_bh(&psta->sleep_q.lock);
 
        if (psta->state&WIFI_SLEEP_STATE) {
@@ -2345,7 +2311,6 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
                if (pstapriv->sta_dz_bitmap & BIT(psta->aid)) {
                        list_del_init(&pxmitframe->list);
 
-
                        list_add_tail(&pxmitframe->list, get_list_head(&psta->sleep_q));
 
                        psta->sleepq_len++;
@@ -2379,14 +2344,11 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
 
                                pstapriv->tim_bitmap |= BIT(psta->aid);
 
-
                                if (update_tim)
                                        /* upate BCN for TIM IE */
                                        update_beacon(padapter, _TIM_IE_, NULL, true);
                        }
 
-
-
                        ret = true;
 
                        DBG_COUNTER(padapter->tx_logs.core_tx_ap_enqueue_ucast);
@@ -2448,27 +2410,21 @@ void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)
        /* for BC/MC Frames */
        psta_bmc = rtw_get_bcmc_stainfo(padapter);
 
-
        spin_lock_bh(&pxmitpriv->lock);
 
        psta->state |= WIFI_SLEEP_STATE;
 
        pstapriv->sta_dz_bitmap |= BIT(psta->aid);
 
-
-
        dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vo_q.sta_pending);
        list_del_init(&pstaxmitpriv->vo_q.tx_pending);
 
-
        dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.sta_pending);
        list_del_init(&pstaxmitpriv->vi_q.tx_pending);
 
-
        dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.sta_pending);
        list_del_init(&pstaxmitpriv->be_q.tx_pending);
 
-
        dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.sta_pending);
        list_del_init(&pstaxmitpriv->bk_q.tx_pending);
 
@@ -2491,7 +2447,6 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
 
        psta_bmc = rtw_get_bcmc_stainfo(padapter);
 
-
        spin_lock_bh(&pxmitpriv->lock);
 
        xmitframe_phead = get_list_head(&psta->sleep_q);
@@ -2545,7 +2500,6 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
 
                rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
 
-
        }
 
        if (psta->sleepq_len == 0) {
@@ -2588,7 +2542,6 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
                        else
                                pxmitframe->attrib.mdata = 0;
 
-
                        pxmitframe->attrib.triggered = 1;
                        rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
 
@@ -2621,7 +2574,6 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 
-
        spin_lock_bh(&pxmitpriv->lock);
 
        xmitframe_phead = get_list_head(&psta->sleep_q);
@@ -2719,7 +2671,6 @@ struct xmit_buf *dequeue_pending_xmitbuf(
        struct xmit_buf *pxmitbuf;
        struct __queue *pqueue;
 
-
        pxmitbuf = NULL;
        pqueue = &pxmitpriv->pending_xmitbuf_queue;
 
@@ -2745,7 +2696,6 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey(
        struct xmit_buf *pxmitbuf;
        struct __queue *pqueue;
 
-
        pxmitbuf = NULL;
        pqueue = &pxmitpriv->pending_xmitbuf_queue;
 
@@ -2804,7 +2754,6 @@ int rtw_xmit_thread(void *context)
        s32 err;
        struct adapter *padapter;
 
-
        err = _SUCCESS;
        padapter = context;