From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23DEAC433EF for ; Thu, 2 Jun 2022 19:37:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238692AbiFBThy (ORCPT ); Thu, 2 Jun 2022 15:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238683AbiFBThr (ORCPT ); Thu, 2 Jun 2022 15:37:47 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A875E2E697 for ; Thu, 2 Jun 2022 12:37:45 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdY-0003py-4H; Thu, 02 Jun 2022 21:37:40 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 01/11] staging: r8188eu: use mgmt to set resp dialog token Date: Thu, 2 Jun 2022 21:37:16 +0200 Message-Id: <20220602193726.280922-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the mgmt structure to set the dialog token of an addba response. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 5446e19d8d09..ad3dc6d1ca6f 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5442,7 +5442,8 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch case WLAN_ACTION_ADDBA_RESP: mgmt->u.action.u.addba_resp.action_code =3D WLAN_ACTION_ADDBA_RESP; pattrib->pktlen++; - pframe =3D rtw_set_fixed_ie(pframe, 1, &pmlmeinfo->ADDBA_req.dialog_toke= n, &pattrib->pktlen); + mgmt->u.action.u.addba_resp.dialog_token =3D pmlmeinfo->ADDBA_req.dialog= _token; + pattrib->pktlen++; pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&status, &pattri= b->pktlen); BA_para_set =3D le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f; BA_para_set |=3D 0x1000; /* 64 buffer size */ --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFBE7C43334 for ; Thu, 2 Jun 2022 19:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238736AbiFBTh6 (ORCPT ); Thu, 2 Jun 2022 15:37:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235283AbiFBThs (ORCPT ); Thu, 2 Jun 2022 15:37:48 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C75E2E685 for ; Thu, 2 Jun 2022 12:37:46 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdZ-0003py-2v; Thu, 02 Jun 2022 21:37:41 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 02/11] staging: r8188eu: use mgmt to set the addba resp status Date: Thu, 2 Jun 2022 21:37:17 +0200 Message-Id: <20220602193726.280922-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the mgmt struct to set the addba response status. The caller passes the status code in host endianness, we have to convert it to little endian. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index ad3dc6d1ca6f..f97a22395ce4 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5444,7 +5444,8 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch pattrib->pktlen++; mgmt->u.action.u.addba_resp.dialog_token =3D pmlmeinfo->ADDBA_req.dialog= _token; pattrib->pktlen++; - pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&status, &pattri= b->pktlen); + mgmt->u.action.u.addba_resp.status =3D cpu_to_le16(status); + pattrib->pktlen +=3D 2; BA_para_set =3D le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f; BA_para_set |=3D 0x1000; /* 64 buffer size */ =20 --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1DB6C43334 for ; Thu, 2 Jun 2022 19:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238743AbiFBTiE (ORCPT ); Thu, 2 Jun 2022 15:38:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233793AbiFBThs (ORCPT ); Thu, 2 Jun 2022 15:37:48 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BDA42E697 for ; Thu, 2 Jun 2022 12:37:47 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdZ-0003py-VH; Thu, 02 Jun 2022 21:37:42 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 03/11] staging: r8188eu: use mgmt to set the addba resp timeout Date: Thu, 2 Jun 2022 21:37:18 +0200 Message-Id: <20220602193726.280922-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the mgmt struct to set the addba response timeout. Copy the timeout from the saved addba request. The timeout field is already le16, we don't have to convert the endianness. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index f97a22395ce4..de2a1e8b1a65 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5456,7 +5456,8 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch le_tmp =3D cpu_to_le16(BA_para_set); =20 pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattri= b->pktlen); - pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&pmlmeinfo->ADDB= A_req.BA_timeout_value, &pattrib->pktlen); + mgmt->u.action.u.addba_resp.timeout =3D pmlmeinfo->ADDBA_req.BA_timeout_= value; + pattrib->pktlen +=3D 2; break; case WLAN_ACTION_DELBA: mgmt->u.action.u.delba.action_code =3D WLAN_ACTION_DELBA; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 505FEC433EF for ; Thu, 2 Jun 2022 19:38:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238840AbiFBTiR (ORCPT ); Thu, 2 Jun 2022 15:38:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238712AbiFBThz (ORCPT ); Thu, 2 Jun 2022 15:37:55 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4E102EA36 for ; Thu, 2 Jun 2022 12:37:53 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqda-0003py-Pq; Thu, 02 Jun 2022 21:37:42 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 04/11] staging: r8188eu: use ieee80211 to set addba resp capabilities Date: Thu, 2 Jun 2022 21:37:19 +0200 Message-Id: <20220602193726.280922-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the mgmt structure and defines from ieee80211.h to set the capabilities field of an addba response. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index de2a1e8b1a65..b391273969af 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5446,16 +5446,11 @@ void issue_action_BA(struct adapter *padapter, unsi= gned char *raddr, unsigned ch pattrib->pktlen++; mgmt->u.action.u.addba_resp.status =3D cpu_to_le16(status); pattrib->pktlen +=3D 2; - BA_para_set =3D le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f; - BA_para_set |=3D 0x1000; /* 64 buffer size */ - - if (pregpriv->ampdu_amsdu =3D=3D 0)/* disabled */ - BA_para_set =3D BA_para_set & ~BIT(0); - else if (pregpriv->ampdu_amsdu =3D=3D 1)/* enabled */ - BA_para_set =3D BA_para_set | BIT(0); - le_tmp =3D cpu_to_le16(BA_para_set); - - pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattri= b->pktlen); + capab =3D le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f; + capab |=3D u16_encode_bits(64, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK); + capab |=3D u16_encode_bits(pregpriv->ampdu_amsdu, IEEE80211_ADDBA_PARAM_= AMSDU_MASK); + mgmt->u.action.u.addba_req.capab =3D cpu_to_le16(capab); + pattrib->pktlen +=3D 2; mgmt->u.action.u.addba_resp.timeout =3D pmlmeinfo->ADDBA_req.BA_timeout_= value; pattrib->pktlen +=3D 2; break; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82586C43334 for ; Thu, 2 Jun 2022 19:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238786AbiFBTiu (ORCPT ); Thu, 2 Jun 2022 15:38:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238690AbiFBThx (ORCPT ); Thu, 2 Jun 2022 15:37:53 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E93F2ED62 for ; Thu, 2 Jun 2022 12:37:52 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdb-0003py-Lj; Thu, 02 Jun 2022 21:37:43 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 05/11] staging: r8188eu: calculate the addba response length Date: Thu, 2 Jun 2022 21:37:20 +0200 Message-Id: <20220602193726.280922-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" An addba response always ends with the timeout field. The length of the addba response is the offset of the end of the timeout field in the struct ieee80211_mgmt that defines the message. Use offsetofend to calculate this offset and drop the intermediate pktlen increments as we add addba response components. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index b391273969af..2a13546e585c 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5441,18 +5441,14 @@ void issue_action_BA(struct adapter *padapter, unsi= gned char *raddr, unsigned ch break; case WLAN_ACTION_ADDBA_RESP: mgmt->u.action.u.addba_resp.action_code =3D WLAN_ACTION_ADDBA_RESP; - pattrib->pktlen++; mgmt->u.action.u.addba_resp.dialog_token =3D pmlmeinfo->ADDBA_req.dialog= _token; - pattrib->pktlen++; mgmt->u.action.u.addba_resp.status =3D cpu_to_le16(status); - pattrib->pktlen +=3D 2; capab =3D le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f; capab |=3D u16_encode_bits(64, IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK); capab |=3D u16_encode_bits(pregpriv->ampdu_amsdu, IEEE80211_ADDBA_PARAM_= AMSDU_MASK); mgmt->u.action.u.addba_req.capab =3D cpu_to_le16(capab); - pattrib->pktlen +=3D 2; mgmt->u.action.u.addba_resp.timeout =3D pmlmeinfo->ADDBA_req.BA_timeout_= value; - pattrib->pktlen +=3D 2; + pattrib->pktlen =3D offsetofend(struct ieee80211_mgmt, u.action.u.addba_= resp.timeout); break; case WLAN_ACTION_DELBA: mgmt->u.action.u.delba.action_code =3D WLAN_ACTION_DELBA; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 651EDC433EF for ; Thu, 2 Jun 2022 19:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238767AbiFBTiI (ORCPT ); Thu, 2 Jun 2022 15:38:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238720AbiFBThw (ORCPT ); Thu, 2 Jun 2022 15:37:52 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62D2F2E0A5 for ; Thu, 2 Jun 2022 12:37:51 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdc-0003py-Gr; Thu, 02 Jun 2022 21:37:44 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 06/11] staging: r8188eu: use mgmt to set the delba reason code Date: Thu, 2 Jun 2022 21:37:21 +0200 Message-Id: <20220602193726.280922-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the mgmt struct to set the delba reason code. Replace the numeric value with a define and remove the temporary variable. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 2a13546e585c..97bc5a968a84 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5367,7 +5367,6 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch { u16 start_seq; u16 BA_para_set; - u16 reason_code; __le16 le_tmp; u16 BA_starting_seqctrl =3D 0; struct xmit_frame *pmgntframe; @@ -5457,9 +5456,8 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch le_tmp =3D cpu_to_le16(BA_para_set); pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattri= b->pktlen); =20 - reason_code =3D 37;/* Requested from peer STA as it does not want to use= the mechanism */ - le_tmp =3D cpu_to_le16(reason_code); - pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattri= b->pktlen); + mgmt->u.action.u.delba.reason_code =3D cpu_to_le16(WLAN_STATUS_REQUEST_D= ECLINED); + pattrib->pktlen +=3D 2; break; default: break; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8917C43334 for ; Thu, 2 Jun 2022 19:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238689AbiFBTiN (ORCPT ); Thu, 2 Jun 2022 15:38:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238714AbiFBThw (ORCPT ); Thu, 2 Jun 2022 15:37:52 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4AC52F00A for ; Thu, 2 Jun 2022 12:37:50 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdd-0003py-AX; Thu, 02 Jun 2022 21:37:45 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 07/11] staging: r8188eu: use mgmt to set delba params Date: Thu, 2 Jun 2022 21:37:22 +0200 Message-Id: <20220602193726.280922-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the mgmt struct to set the delba parameters. Use the exact same value for the parameters as the current code. Remove a dead increment of pframe, we don't use pframe for the delba message any more. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 97bc5a968a84..b4d22dae212a 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5366,8 +5366,6 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da,= unsigned short reason, int void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsig= ned char action, unsigned short status) { u16 start_seq; - u16 BA_para_set; - __le16 le_tmp; u16 BA_starting_seqctrl =3D 0; struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -5403,7 +5401,6 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch mgmt->seq_ctrl =3D cpu_to_le16(pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; =20 - pframe +=3D sizeof(struct ieee80211_hdr_3addr); pattrib->pktlen =3D sizeof(struct ieee80211_hdr_3addr); =20 mgmt->u.action.category =3D WLAN_CATEGORY_BACK; @@ -5452,10 +5449,8 @@ void issue_action_BA(struct adapter *padapter, unsig= ned char *raddr, unsigned ch case WLAN_ACTION_DELBA: mgmt->u.action.u.delba.action_code =3D WLAN_ACTION_DELBA; pattrib->pktlen++; - BA_para_set =3D (status & 0x1F) << 3; - le_tmp =3D cpu_to_le16(BA_para_set); - pframe =3D rtw_set_fixed_ie(pframe, 2, (unsigned char *)&le_tmp, &pattri= b->pktlen); - + mgmt->u.action.u.delba.params =3D cpu_to_le16((status & 0x1F) << 3); + pattrib->pktlen +=3D 2; mgmt->u.action.u.delba.reason_code =3D cpu_to_le16(WLAN_STATUS_REQUEST_D= ECLINED); pattrib->pktlen +=3D 2; break; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1613CC43334 for ; Thu, 2 Jun 2022 19:38:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238815AbiFBTif (ORCPT ); Thu, 2 Jun 2022 15:38:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238723AbiFBThz (ORCPT ); Thu, 2 Jun 2022 15:37:55 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1170C2F00F for ; Thu, 2 Jun 2022 12:37:53 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqde-0003py-PW; Thu, 02 Jun 2022 21:37:47 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 08/11] staging: r8188eu: clarify the contents of the delba params Date: Thu, 2 Jun 2022 21:37:23 +0200 Message-Id: <20220602193726.280922-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The delba parameters field contains an initiator/receiver flag and the tid. The caller of issue_action_BA passes these components in the status parameter. Extract the two components from status and use u16_encode_bits to copy them into the parameters field. This should clarify what's going on and should make it easier to replace the status parameter in the future. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index b4d22dae212a..7968674a0705 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5377,7 +5377,7 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch struct sta_priv *pstapriv =3D &padapter->stapriv; struct registry_priv *pregpriv =3D &padapter->registrypriv; struct ieee80211_mgmt *mgmt; - u16 capab; + u16 capab, params; =20 pmgntframe =3D alloc_mgtxmitframe(pxmitpriv); if (!pmgntframe) @@ -5450,6 +5450,9 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch mgmt->u.action.u.delba.action_code =3D WLAN_ACTION_DELBA; pattrib->pktlen++; mgmt->u.action.u.delba.params =3D cpu_to_le16((status & 0x1F) << 3); + params =3D u16_encode_bits((status & 0x1), IEEE80211_DELBA_PARAM_INITIAT= OR_MASK); + params |=3D u16_encode_bits((status >> 1) & 0xF, IEEE80211_DELBA_PARAM_T= ID_MASK); + mgmt->u.action.u.delba.params =3D cpu_to_le16(params); pattrib->pktlen +=3D 2; mgmt->u.action.u.delba.reason_code =3D cpu_to_le16(WLAN_STATUS_REQUEST_D= ECLINED); pattrib->pktlen +=3D 2; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D31EBC43334 for ; Thu, 2 Jun 2022 19:38:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238011AbiFBTir (ORCPT ); Thu, 2 Jun 2022 15:38:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238718AbiFBThz (ORCPT ); Thu, 2 Jun 2022 15:37:55 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 112E92ED64 for ; Thu, 2 Jun 2022 12:37:53 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdg-0003py-PL; Thu, 02 Jun 2022 21:37:48 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 09/11] staging: r8188eu: calculate the delba length Date: Thu, 2 Jun 2022 21:37:24 +0200 Message-Id: <20220602193726.280922-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use offsetofend to calculate the length of the delba message. We are now calculating all message lengths based on the offset of their last field. All intermediate updates of pattrib->pktlen can be removed. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 7968674a0705..565e447bb75e 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5401,10 +5401,7 @@ void issue_action_BA(struct adapter *padapter, unsig= ned char *raddr, unsigned ch mgmt->seq_ctrl =3D cpu_to_le16(pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++; =20 - pattrib->pktlen =3D sizeof(struct ieee80211_hdr_3addr); - mgmt->u.action.category =3D WLAN_CATEGORY_BACK; - pattrib->pktlen++; =20 switch (action) { case WLAN_ACTION_ADDBA_REQ: @@ -5448,14 +5445,12 @@ void issue_action_BA(struct adapter *padapter, unsi= gned char *raddr, unsigned ch break; case WLAN_ACTION_DELBA: mgmt->u.action.u.delba.action_code =3D WLAN_ACTION_DELBA; - pattrib->pktlen++; mgmt->u.action.u.delba.params =3D cpu_to_le16((status & 0x1F) << 3); params =3D u16_encode_bits((status & 0x1), IEEE80211_DELBA_PARAM_INITIAT= OR_MASK); params |=3D u16_encode_bits((status >> 1) & 0xF, IEEE80211_DELBA_PARAM_T= ID_MASK); mgmt->u.action.u.delba.params =3D cpu_to_le16(params); - pattrib->pktlen +=3D 2; mgmt->u.action.u.delba.reason_code =3D cpu_to_le16(WLAN_STATUS_REQUEST_D= ECLINED); - pattrib->pktlen +=3D 2; + pattrib->pktlen =3D offsetofend(struct ieee80211_mgmt, u.action.u.delba.= reason_code); break; default: break; --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18E87C433EF for ; Thu, 2 Jun 2022 19:38:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237314AbiFBTi2 (ORCPT ); Thu, 2 Jun 2022 15:38:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238726AbiFBTh4 (ORCPT ); Thu, 2 Jun 2022 15:37:56 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA12B30F40 for ; Thu, 2 Jun 2022 12:37:54 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdh-0003py-QK; Thu, 02 Jun 2022 21:37:49 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 10/11] staging: r8188eu: remove the pframe variable Date: Thu, 2 Jun 2022 21:37:25 +0200 Message-Id: <20220602193726.280922-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the pframe variable, it is no longer used for populating fields of the outgoing frame. pmgntframe->buf_addr is already a u8 *, we can drop the (u8 *) cast. Increment the u8 *pmgntframe->buf_addr by TXDESC_OFFSET before we cast it to struct ieee80211_mgmt *. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 565e447bb75e..c025f95defab 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5369,7 +5369,6 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch u16 BA_starting_seqctrl =3D 0; struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; - u8 *pframe; struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; @@ -5389,8 +5388,7 @@ void issue_action_BA(struct adapter *padapter, unsign= ed char *raddr, unsigned ch =20 memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); =20 - pframe =3D (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; - mgmt =3D (struct ieee80211_mgmt *)pframe; + mgmt =3D (struct ieee80211_mgmt *)(pmgntframe->buf_addr + TXDESC_OFFSET); =20 mgmt->frame_control =3D cpu_to_le16(IEEE80211_STYPE_ACTION | IEEE80211_FT= YPE_MGMT); =20 --=20 2.30.2 From nobody Tue Apr 28 07:43:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1CBDC433EF for ; Thu, 2 Jun 2022 19:38:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238722AbiFBTiV (ORCPT ); Thu, 2 Jun 2022 15:38:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238739AbiFBTh6 (ORCPT ); Thu, 2 Jun 2022 15:37:58 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB1DE31225 for ; Thu, 2 Jun 2022 12:37:55 -0700 (PDT) Received: from ipservice-092-217-081-045.092.217.pools.vodafone-ip.de ([92.217.81.45] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nwqdi-0003py-Q5; Thu, 02 Jun 2022 21:37:50 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 11/11] staging: r8188eu: use u8, u16 in issue_action_BA prototype Date: Thu, 2 Jun 2022 21:37:26 +0200 Message-Id: <20220602193726.280922-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602193726.280922-1-martin@kaiser.cx> References: <20220602193726.280922-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use u8 and u16 in the issue_action_BA prototype. The code expects these parameters to be exactly 8 and 16 bits wide. Signed-off-by: Martin Kaiser Tested-by: Pavel Skripkin --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index c025f95defab..1c1598c71b78 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -5363,7 +5363,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da,= unsigned short reason, int return ret; } =20 -void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsig= ned char action, unsigned short status) +void issue_action_BA(struct adapter *padapter, unsigned char *raddr, u8 ac= tion, u16 status) { u16 start_seq; u16 BA_starting_seqctrl =3D 0; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 573d65b175cc..71864733b1c0 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -524,8 +524,7 @@ int issue_deauth(struct adapter *padapter, unsigned cha= r *da, unsigned short reason); int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reaso= n, int try_cnt, int wait_ms); -void issue_action_BA(struct adapter *padapter, unsigned char *raddr, - unsigned char action, unsigned short status); +void issue_action_BA(struct adapter *padapter, unsigned char *raddr, u8 ac= tion, u16 status); unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr); unsigned int send_beacon(struct adapter *padapter); bool get_beacon_valid_bit(struct adapter *adapter); --=20 2.30.2