From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 6/7] staging: r8188eu: check for initiator vs recipient
Date: Sat, 14 May 2022 18:47:39 +0200 [thread overview]
Message-ID: <20220514164740.282552-7-martin@kaiser.cx> (raw)
In-Reply-To: <20220514164740.282552-1-martin@kaiser.cx>
For an incoming delba message, the code checks if the delba was sent by
the data initiator or by the data recipient.
Rewrite this check using the ieee80211 helpers, making the code easier to
understand.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 9aa6d09b2e74..af525d633fd7 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -1517,10 +1517,11 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_fr
}
break;
case WLAN_ACTION_DELBA:
- if ((frame_body[3] & BIT(3)) == 0) {
+ if (u16_get_bits(le16_to_cpu(mgmt->u.action.u.delba.params),
+ IEEE80211_DELBA_PARAM_INITIATOR_MASK) == WLAN_BACK_RECIPIENT) {
psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf));
- } else if ((frame_body[3] & BIT(3)) == BIT(3)) {
+ } else {
tid = (frame_body[3] >> 4) & 0x0F;
preorder_ctrl = &psta->recvreorder_ctrl[tid];
preorder_ctrl->enable = false;
--
2.30.2
next prev parent reply other threads:[~2022-05-14 16:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-14 16:47 [PATCH 0/7] staging: r8188eu: more cleanups in OnAction_back Martin Kaiser
2022-05-14 16:47 ` [PATCH 1/7] staging: r8188eu: get addba resp status from ieee80211_mgmt Martin Kaiser
2022-05-14 16:47 ` [PATCH 2/7] staging: r8188eu: read addba resp tid " Martin Kaiser
2022-05-14 16:47 ` [PATCH 3/7] staging: r8188eu: merge process_addba_req into OnAction_back Martin Kaiser
2022-05-14 16:47 ` [PATCH 4/7] staging: r8188eu: replace if with ternary operator Martin Kaiser
2022-05-14 17:54 ` Joe Perches
2022-05-14 16:47 ` [PATCH 5/7] staging: r8188eu: use BIT(tid) instead of manual shift Martin Kaiser
2022-05-14 16:47 ` Martin Kaiser [this message]
2022-05-14 16:47 ` [PATCH 7/7] staging: r8188eu: use the tid in delba processing Martin Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220514164740.282552-7-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
--cc=straube.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®