2022-08-06 19:57:28

by Martin Kaiser

Subject: [PATCH] staging: r8188eu: txpktbuf_bndy does not depend on wifi_spec

Remove the if clause that sets txpktbuf_bndy. Both branches set the same
value.

Signed-off-by: Martin Kaiser <[email protected]>
---
drivers/staging/r8188eu/hal/usb_halinit.c | 12 ++----------
drivers/staging/r8188eu/include/rtl8188e_hal.h | 6 ------
2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index efb529bb4c8a..8b36fb56076e 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -567,7 +567,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
{
u8 value8 = 0;
u16 value16;
- u8 txpktbuf_bndy;
u32 status = _SUCCESS;
int res;
struct hal_data_8188e *haldata = &Adapter->haldata;
@@ -600,13 +599,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
/* HW GPIO pin. Before PHY_RFConfig8192C. */
/* 2010/08/26 MH If Efuse does not support sective suspend then disable the function. */

- if (!pregistrypriv->wifi_spec) {
- txpktbuf_bndy = TX_PAGE_BOUNDARY_88E;
- } else {
- /* for WMM */
- txpktbuf_bndy = WMM_NORMAL_TX_PAGE_BOUNDARY_88E;
- }
-
_InitQueueReservedPage(Adapter);
_InitQueuePriority(Adapter);
_InitPageBoundary(Adapter);
@@ -647,9 +639,9 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
if (status == _FAIL)
goto exit;

- _InitTxBufferBoundary(Adapter, txpktbuf_bndy);
+ _InitTxBufferBoundary(Adapter, TX_PAGE_BOUNDARY_88E);

- status = InitLLTTable(Adapter, txpktbuf_bndy);
+ status = InitLLTTable(Adapter, TX_PAGE_BOUNDARY_88E);
if (status == _FAIL)
goto exit;

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 5cd62b216720..fdc187f4deaa 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -51,12 +51,6 @@

#define TX_PAGE_BOUNDARY_88E (TX_TOTAL_PAGE_NUMBER_88E + 1)

-/* Note: For Normal Chip Setting ,modify later */
-#define WMM_NORMAL_TX_TOTAL_PAGE_NUMBER \
- TX_TOTAL_PAGE_NUMBER_88E /* 0xA9 , 0xb0=>176=>22k */
-#define WMM_NORMAL_TX_PAGE_BOUNDARY_88E \
- (WMM_NORMAL_TX_TOTAL_PAGE_NUMBER + 1) /* 0xA9 */
-
#include "HalVerDef.h"
#include "hal_com.h"

--
2.30.2

2022-08-07 06:25:43

by Philipp Hortmann

Subject: Re: [PATCH] staging: r8188eu: txpktbuf_bndy does not depend on wifi_spec

On 8/6/22 21:43, Martin Kaiser wrote:
> Remove the if clause that sets txpktbuf_bndy. Both branches set the same
> value.
>
> Signed-off-by: Martin Kaiser <[email protected]>
> ---
> drivers/staging/r8188eu/hal/usb_halinit.c | 12 ++----------
> drivers/staging/r8188eu/include/rtl8188e_hal.h | 6 ------
> 2 files changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
> index efb529bb4c8a..8b36fb56076e 100644
> --- a/drivers/staging/r8188eu/hal/usb_halinit.c
> +++ b/drivers/staging/r8188eu/hal/usb_halinit.c
> @@ -567,7 +567,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
> {
> u8 value8 = 0;
> u16 value16;
> - u8 txpktbuf_bndy;
> u32 status = _SUCCESS;
> int res;
> struct hal_data_8188e *haldata = &Adapter->haldata;
> @@ -600,13 +599,6 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
> /* HW GPIO pin. Before PHY_RFConfig8192C. */
> /* 2010/08/26 MH If Efuse does not support sective suspend then disable the function. */
>
> - if (!pregistrypriv->wifi_spec) {
> - txpktbuf_bndy = TX_PAGE_BOUNDARY_88E;
> - } else {
> - /* for WMM */
> - txpktbuf_bndy = WMM_NORMAL_TX_PAGE_BOUNDARY_88E;
> - }
> -
> _InitQueueReservedPage(Adapter);
> _InitQueuePriority(Adapter);
> _InitPageBoundary(Adapter);
> @@ -647,9 +639,9 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
> if (status == _FAIL)
> goto exit;
>
> - _InitTxBufferBoundary(Adapter, txpktbuf_bndy);
> + _InitTxBufferBoundary(Adapter, TX_PAGE_BOUNDARY_88E);
>
> - status = InitLLTTable(Adapter, txpktbuf_bndy);
> + status = InitLLTTable(Adapter, TX_PAGE_BOUNDARY_88E);
> if (status == _FAIL)
> goto exit;
>
> diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
> index 5cd62b216720..fdc187f4deaa 100644
> --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
> +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
> @@ -51,12 +51,6 @@
>
> #define TX_PAGE_BOUNDARY_88E (TX_TOTAL_PAGE_NUMBER_88E + 1)
>
> -/* Note: For Normal Chip Setting ,modify later */
> -#define WMM_NORMAL_TX_TOTAL_PAGE_NUMBER \
> - TX_TOTAL_PAGE_NUMBER_88E /* 0xA9 , 0xb0=>176=>22k */
> -#define WMM_NORMAL_TX_PAGE_BOUNDARY_88E \
> - (WMM_NORMAL_TX_TOTAL_PAGE_NUMBER + 1) /* 0xA9 */
> -
> #include "HalVerDef.h"
> #include "hal_com.h"
>

Tested-by: Philipp Hortmann <[email protected]> # Edimax N150