staging: r8188eu: use ieee80211 to set addba capabilities

Use the mgmt structure and defines from ieee80211.h to set the
capabilities field of an addba request.

If issue_action_BA is called with action == WLAN_ACTION_ADDBA_REQ, the
status parameter contains the tid.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220524090029.242584-11-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index da0c036..823c548 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -5380,6 +5380,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
        struct sta_priv *pstapriv = &padapter->stapriv;
        struct registry_priv *pregpriv = &padapter->registrypriv;
        struct ieee80211_mgmt *mgmt;
+       u16 capab;
 
        pmgntframe = alloc_mgtxmitframe(pxmitpriv);
        if (!pmgntframe)
@@ -5419,9 +5420,12 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
                mgmt->u.action.u.addba_req.dialog_token = pmlmeinfo->dialogToken;
                pattrib->pktlen++;
 
-               BA_para_set = (0x1002 | ((status & 0xf) << 2)); /* immediate ack & 64 buffer size */
-               le_tmp = cpu_to_le16(BA_para_set);
-               pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattrib->pktlen);
+               /* immediate ack & 64 buffer size */
+               capab = u16_encode_bits(64, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
+               capab |= u16_encode_bits(1, IEEE80211_ADDBA_PARAM_POLICY_MASK);
+               capab |= u16_encode_bits(status, IEEE80211_ADDBA_PARAM_TID_MASK);
+               mgmt->u.action.u.addba_req.capab = cpu_to_le16(capab);
+               pattrib->pktlen += 2;
 
                mgmt->u.action.u.addba_req.timeout = cpu_to_le16(5000); /* 5 ms */
                pattrib->pktlen += 2;