staging: r8188eu: use ieee80211 to set addba resp capabilities
authorMartin Kaiser <martin@kaiser.cx>
Thu, 2 Jun 2022 19:37:19 +0000 (21:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Jun 2022 06:08:35 +0000 (08:08 +0200)
Use the mgmt structure and defines from ieee80211.h to set the
capabilities field of an addba response.

Tested-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220602193726.280922-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_mlme_ext.c

index 8c562c5..3b68440 100644 (file)
@@ -5446,16 +5446,11 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
                pattrib->pktlen++;
                mgmt->u.action.u.addba_resp.status = cpu_to_le16(status);
                pattrib->pktlen += 2;
-               BA_para_set = le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f;
-               BA_para_set |= 0x1000; /* 64 buffer size */
-
-               if (pregpriv->ampdu_amsdu == 0)/* disabled */
-                       BA_para_set = BA_para_set & ~BIT(0);
-               else if (pregpriv->ampdu_amsdu == 1)/* enabled */
-                       BA_para_set = BA_para_set | BIT(0);
-               le_tmp = cpu_to_le16(BA_para_set);
-
-               pframe = rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattrib->pktlen);
+               capab = le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f;
+               capab |= u16_encode_bits(64, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK);
+               capab |= u16_encode_bits(pregpriv->ampdu_amsdu, IEEE80211_ADDBA_PARAM_AMSDU_MASK);
+               mgmt->u.action.u.addba_req.capab = cpu_to_le16(capab);
+               pattrib->pktlen += 2;
                mgmt->u.action.u.addba_resp.timeout = pmlmeinfo->ADDBA_req.BA_timeout_value;
                pattrib->pktlen += 2;
                break;