diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2021-05-06 14:14:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-10 14:34:44 +0200 |
| commit | edee771a4533002575b74ef18f958c896f3804dd (patch) | |
| tree | 07436dac4638fa28ac6e4b9d6bf4e513a3001eba /drivers | |
| parent | 706321a53857f99f00fce0bc0ed1fa2102896c46 (diff) | |
| download | linux-edee771a4533002575b74ef18f958c896f3804dd.tar.bz2 | |
staging: rtl8188eu: remove nic_hdl from struct mlme_priv
struct mlme_priv is an element of struct adapter. Use container_of
to get a pointer to the enclosing struct.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210506121410.17613-1-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_mlme.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c index 049e25455849..159465b073c2 100644 --- a/drivers/staging/rtl8188eu/core/rtw_mlme.c +++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c @@ -32,8 +32,6 @@ int rtw_init_mlme_priv(struct adapter *padapter) /* We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */ - pmlmepriv->nic_hdl = (u8 *)padapter; - pmlmepriv->pscanned = NULL; pmlmepriv->fw_state = 0; pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; @@ -1446,7 +1444,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) { int ret; struct list_head *phead; - struct adapter *adapter; + struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv); struct __queue *queue = &pmlmepriv->scanned_queue; struct wlan_network *pnetwork = NULL; struct wlan_network *candidate = NULL; @@ -1454,7 +1452,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) spin_lock_bh(&pmlmepriv->scanned_queue.lock); phead = get_list_head(queue); - adapter = (struct adapter *)pmlmepriv->nic_hdl; list_for_each(pmlmepriv->pscanned, phead) { pnetwork = list_entry(pmlmepriv->pscanned, struct wlan_network, list); diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h index 1b74b32b8a81..f5e805c13442 100644 --- a/drivers/staging/rtl8188eu/include/rtw_mlme.h +++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h @@ -111,8 +111,6 @@ struct mlme_priv { u8 to_join; /* flag */ u8 to_roaming; /* roaming trying times */ - u8 *nic_hdl; - struct list_head *pscanned; struct __queue free_bss_pool; struct __queue scanned_queue; |