staging: r8188eu: simplify frame type check

Reorder the code in rtw_make_wlanhdr to make the function simpler.
There's a large if statement to check that we process only data frames.
Revert the condition and exit for non-data frames.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221230180646.91008-10-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index bc5ceb2..becd1db 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -809,90 +809,91 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattr
 
        SetFrameSubType(fctrl, pattrib->subtype);
 
-       if (pattrib->subtype & IEEE80211_FTYPE_DATA) {
-               if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
-                       /* to_ds = 1, fr_ds = 0; */
-                       /* Data transfer to AP */
-                       SetToDs(fctrl);
-                       memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
-                       memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
-                       memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
-
-                       if (pqospriv->qos_option)
-                               qos_option = true;
-               } else if (check_fwstate(pmlmepriv,  WIFI_AP_STATE)) {
-                       /* to_ds = 0, fr_ds = 1; */
-                       SetFrDs(fctrl);
-                       memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
-                       memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN);
-                       memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
-
-                       if (psta->qos_option)
-                               qos_option = true;
-               } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
-                          check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
-                       memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
-                       memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
-                       memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
-
-                       if (psta->qos_option)
-                               qos_option = true;
-               } else {
-                       res = _FAIL;
-                       goto exit;
-               }
+       if (!(pattrib->subtype & IEEE80211_FTYPE_DATA))
+               return _SUCCESS;
+
+       if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
+               /* to_ds = 1, fr_ds = 0; */
+               /* Data transfer to AP */
+               SetToDs(fctrl);
+               memcpy(pwlanhdr->addr1, get_bssid(pmlmepriv), ETH_ALEN);
+               memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
+               memcpy(pwlanhdr->addr3, pattrib->dst, ETH_ALEN);
+
+               if (pqospriv->qos_option)
+                       qos_option = true;
+       } else if (check_fwstate(pmlmepriv,  WIFI_AP_STATE)) {
+               /* to_ds = 0, fr_ds = 1; */
+               SetFrDs(fctrl);
+               memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
+               memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN);
+               memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
 
-               if (pattrib->mdata)
-                       SetMData(fctrl);
+               if (psta->qos_option)
+                       qos_option = true;
+       } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
+                  check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
+               memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN);
+               memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
+               memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
 
-               if (pattrib->encrypt)
-                       SetPrivacy(fctrl);
+               if (psta->qos_option)
+                       qos_option = true;
+       } else {
+               res = _FAIL;
+               goto exit;
+       }
 
-               if (qos_option) {
-                       qc = (unsigned short *)(hdr + pattrib->hdrlen - 2);
+       if (pattrib->mdata)
+               SetMData(fctrl);
 
-                       if (pattrib->priority)
-                               SetPriority(qc, pattrib->priority);
+       if (pattrib->encrypt)
+               SetPrivacy(fctrl);
 
-                       SetEOSP(qc, pattrib->eosp);
+       if (qos_option) {
+               qc = (unsigned short *)(hdr + pattrib->hdrlen - 2);
 
-                       SetAckpolicy(qc, pattrib->ack_policy);
-               }
+               if (pattrib->priority)
+                       SetPriority(qc, pattrib->priority);
 
-               /* TODO: fill HT Control Field */
+               SetEOSP(qc, pattrib->eosp);
 
-               /* Update Seq Num will be handled by f/w */
-               if (psta) {
-                       psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
-                       psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF;
+               SetAckpolicy(qc, pattrib->ack_policy);
+       }
 
-                       pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority];
+       /* TODO: fill HT Control Field */
 
-                       SetSeqNum(hdr, pattrib->seqnum);
+       /* Update Seq Num will be handled by f/w */
+       if (psta) {
+               psta->sta_xmitpriv.txseq_tid[pattrib->priority]++;
+               psta->sta_xmitpriv.txseq_tid[pattrib->priority] &= 0xFFF;
 
-                       /* check if enable ampdu */
-                       if (pattrib->ht_en && psta->htpriv.ampdu_enable) {
-                               if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
-                                       pattrib->ampdu_en = true;
-                       }
+               pattrib->seqnum = psta->sta_xmitpriv.txseq_tid[pattrib->priority];
 
-                       /* re-check if enable ampdu by BA_starting_seqctrl */
-                       if (pattrib->ampdu_en) {
-                               u16 tx_seq;
+               SetSeqNum(hdr, pattrib->seqnum);
 
-                               tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
+               /* check if enable ampdu */
+               if (pattrib->ht_en && psta->htpriv.ampdu_enable) {
+                       if (psta->htpriv.agg_enable_bitmap & BIT(pattrib->priority))
+                               pattrib->ampdu_en = true;
+               }
 
-                               /* check BA_starting_seqctrl */
-                               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;
+               /* re-check if enable ampdu by BA_starting_seqctrl */
+               if (pattrib->ampdu_en) {
+                       u16 tx_seq;
 
-                                       pattrib->ampdu_en = true;/* AGG EN */
-                               } else {
-                                       psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum + 1) & 0xfff;
-                                       pattrib->ampdu_en = true;/* AGG EN */
-                               }
+                       tx_seq = psta->BA_starting_seqctrl[pattrib->priority & 0x0f];
+
+                       /* check BA_starting_seqctrl */
+                       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;
+
+                               pattrib->ampdu_en = true;/* AGG EN */
+                       } else {
+                               psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum + 1) & 0xfff;
+                               pattrib->ampdu_en = true;/* AGG EN */
                        }
                }
        }