From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Michael Straube <straube.linux@gmail.com>, gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: r8188eu: remove HW_VAR_AMPDU_FACTOR from SetHwReg8188EU()
Date: Sat, 2 Jul 2022 09:14:18 +0200 [thread overview]
Message-ID: <ddbb1600-823f-86f9-e2be-4e6dbf501185@gmail.com> (raw)
In-Reply-To: <20220701210753.8210-1-straube.linux@gmail.com>
On 7/1/22 23:07, Michael Straube wrote:
> Remove the case HW_VAR_AMPDU_FACTOR from SetHwReg8188EU() and move
> the functionality to a static function in rtw_wlan_util.c. This is
> part of the ongoing effort to get rid of SetHwReg8188EU().
>
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> drivers/staging/r8188eu/core/rtw_wlan_util.c | 28 +++++++++++++++++++-
> drivers/staging/r8188eu/hal/usb_halinit.c | 26 ------------------
> drivers/staging/r8188eu/include/hal_intf.h | 1 -
> 3 files changed, 27 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
> index 2d5fd654ead9..aa6b549fd54d 100644
> --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
> +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
> @@ -805,6 +805,32 @@ static void set_min_ampdu_spacing(struct adapter *adapter, u8 spacing)
> }
> }
>
> +static void set_ampdu_factor(struct adapter *adapter, u8 factor)
> +{
> + u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9};
> + u8 FactorToSet;
> + u8 *pRegToSet;
> + u8 index = 0;
> +
> + pRegToSet = RegToSet_Normal; /* 0xb972a841; */
> + FactorToSet = factor;
> + if (FactorToSet <= 3) {
> + FactorToSet = (1 << (FactorToSet + 2));
> + if (FactorToSet > 0xf)
> + FactorToSet = 0xf;
> +
> + for (index = 0; index < 4; index++) {
> + if ((pRegToSet[index] & 0xf0) > (FactorToSet << 4))
> + pRegToSet[index] = (pRegToSet[index] & 0x0f) | (FactorToSet << 4);
> +
> + if ((pRegToSet[index] & 0x0f) > FactorToSet)
> + pRegToSet[index] = (pRegToSet[index] & 0xf0) | (FactorToSet);
> +
> + rtw_write8(adapter, (REG_AGGLEN_LMT + index), pRegToSet[index]);
> + }
> + }
> +}
> +
> void HTOnAssocRsp(struct adapter *padapter)
> {
> unsigned char max_AMPDU_len;
> @@ -831,7 +857,7 @@ void HTOnAssocRsp(struct adapter *padapter)
>
> set_min_ampdu_spacing(padapter, min_MPDU_spacing);
>
> - SetHwReg8188EU(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
> + set_ampdu_factor(padapter, max_AMPDU_len);
> }
>
> void ERP_IE_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)
> diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
> index 3908c46d2fbe..1a08de85a6ae 100644
> --- a/drivers/staging/r8188eu/hal/usb_halinit.c
> +++ b/drivers/staging/r8188eu/hal/usb_halinit.c
> @@ -1209,32 +1209,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
> case HW_VAR_DM_FUNC_CLR:
> podmpriv->SupportAbility = 0;
> break;
> - case HW_VAR_AMPDU_FACTOR:
> - {
> - u8 RegToSet_Normal[4] = {0x41, 0xa8, 0x72, 0xb9};
> - u8 FactorToSet;
> - u8 *pRegToSet;
> - u8 index = 0;
> -
> - pRegToSet = RegToSet_Normal; /* 0xb972a841; */
> - FactorToSet = *((u8 *)val);
> - if (FactorToSet <= 3) {
> - FactorToSet = (1 << (FactorToSet + 2));
> - if (FactorToSet > 0xf)
> - FactorToSet = 0xf;
> -
> - for (index = 0; index < 4; index++) {
> - if ((pRegToSet[index] & 0xf0) > (FactorToSet << 4))
> - pRegToSet[index] = (pRegToSet[index] & 0x0f) | (FactorToSet << 4);
> -
> - if ((pRegToSet[index] & 0x0f) > FactorToSet)
> - pRegToSet[index] = (pRegToSet[index] & 0xf0) | (FactorToSet);
> -
> - rtw_write8(Adapter, (REG_AGGLEN_LMT + index), pRegToSet[index]);
> - }
> - }
> - }
> - break;
> default:
> break;
> }
> diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
> index c3704618bccc..b81144932d9a 100644
> --- a/drivers/staging/r8188eu/include/hal_intf.h
> +++ b/drivers/staging/r8188eu/include/hal_intf.h
> @@ -17,7 +17,6 @@ enum hw_variables {
> HW_VAR_DM_FUNC_OP,
> HW_VAR_DM_FUNC_RESET,
> HW_VAR_DM_FUNC_CLR,
> - HW_VAR_AMPDU_FACTOR,
> };
>
> typedef s32 (*c2h_id_filter)(u8 id);
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
prev parent reply other threads:[~2022-07-02 7:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 21:07 [PATCH] staging: r8188eu: remove HW_VAR_AMPDU_FACTOR from SetHwReg8188EU() Michael Straube
2022-07-02 7:14 ` Philipp Hortmann [this message]
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=ddbb1600-823f-86f9-e2be-4e6dbf501185@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.