2022-04-21 19:06:46

by Jaehee Park

Subject: [PATCH v3 1/7] staging: r8188eu: remove unused member free_bss_buf

The free_bss_buf member of pmlmepriv is unused. Remove all related
lines.

Suggested-by: Pavel Skripkin <[email protected]>
Signed-off-by: Jaehee Park <[email protected]>
---
drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
drivers/staging/r8188eu/core/rtw_mlme.c | 21 +--------------------
2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index 1dc1fbf049af..0f03ac43079c 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -319,7 +319,6 @@ struct mlme_priv {
struct list_head *pscanned;
struct __queue free_bss_pool;
struct __queue scanned_queue;
- u8 *free_bss_buf;
u8 key_mask; /* use to restore wep key after hal_init */
u32 num_of_scanned;

diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
index 3e9882f89f76..8af11626a3e7 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme.c
@@ -33,8 +33,7 @@ u8 rtw_to_roaming(struct adapter *adapter)
static int _rtw_init_mlme_priv(struct adapter *padapter)
{
int i;
- u8 *pbuf;
- struct wlan_network *pnetwork;
+ struct wlan_network *pnetwork = NULL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int res = _SUCCESS;

@@ -55,16 +54,6 @@ static int _rtw_init_mlme_priv(struct adapter *padapter)

memset(&pmlmepriv->assoc_ssid, 0, sizeof(struct ndis_802_11_ssid));

- pbuf = vzalloc(MAX_BSS_CNT * (sizeof(struct wlan_network)));
-
- if (!pbuf) {
- res = _FAIL;
- goto exit;
- }
- pmlmepriv->free_bss_buf = pbuf;
-
- pnetwork = (struct wlan_network *)pbuf;
-
for (i = 0; i < MAX_BSS_CNT; i++) {
INIT_LIST_HEAD(&pnetwork->list);

@@ -79,8 +68,6 @@ static int _rtw_init_mlme_priv(struct adapter *padapter)

rtw_init_mlme_timer(padapter);

-exit:
-
return res;
}

@@ -109,13 +96,7 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)

void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
{
-
rtw_free_mlme_priv_ie_data(pmlmepriv);
-
- if (pmlmepriv) {
- vfree(pmlmepriv->free_bss_buf);
- }
-
}

struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *free_queue) */
--
2.25.1

2022-04-22 06:48:41

by Greg Kroah-Hartman

Subject: Re: [PATCH v3 1/7] staging: r8188eu: remove unused member free_bss_buf

On Tue, Apr 19, 2022 at 02:19:32PM -0400, Jaehee Park wrote:
> The free_bss_buf member of pmlmepriv is unused. Remove all related
> lines.
>
> Suggested-by: Pavel Skripkin <[email protected]>
> Signed-off-by: Jaehee Park <[email protected]>
> ---
> drivers/staging/r8188eu/include/rtw_mlme.h | 1 -
> drivers/staging/r8188eu/core/rtw_mlme.c | 21 +--------------------
> 2 files changed, 1 insertion(+), 21 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
> index 1dc1fbf049af..0f03ac43079c 100644
> --- a/drivers/staging/r8188eu/include/rtw_mlme.h
> +++ b/drivers/staging/r8188eu/include/rtw_mlme.h
> @@ -319,7 +319,6 @@ struct mlme_priv {
> struct list_head *pscanned;
> struct __queue free_bss_pool;
> struct __queue scanned_queue;
> - u8 *free_bss_buf;
> u8 key_mask; /* use to restore wep key after hal_init */
> u32 num_of_scanned;
>
> diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
> index 3e9882f89f76..8af11626a3e7 100644
> --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> @@ -33,8 +33,7 @@ u8 rtw_to_roaming(struct adapter *adapter)
> static int _rtw_init_mlme_priv(struct adapter *padapter)
> {
> int i;
> - u8 *pbuf;
> - struct wlan_network *pnetwork;
> + struct wlan_network *pnetwork = NULL;

Why did you add this line? It caused the real error to be ignored that
the compiler was trying to tell you :(