diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-04-26 18:55:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-26 10:16:22 -0700 |
| commit | 2d5eafc179403b30af1d30bea932aebf375fb513 (patch) | |
| tree | 9dcf4b7f5c28ee3d581583305f47fb9e33249e33 | |
| parent | 528e5c1dc78b9b4429f06d148014c048538019b5 (diff) | |
staging: rtl8723au: Get rid of _rtw_free_network23a_nolock23a()
_rtw_free_network23a() and _rtw_free_network23a_nolock23a() are now
identical - one copy should do.
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_mlme.c | 16 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/rtw_mlme.h | 3 |
2 files changed, 1 insertions, 18 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index b39945ef02da..8d64cb02ee8e 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -160,20 +160,6 @@ static void _rtw_free_network23a(struct mlme_priv *pmlmepriv, kfree(pnetwork); } -void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv, - struct wlan_network *pnetwork) -{ - if (!pnetwork) - return; - - if (pnetwork->fixed == true) - return; - - list_del_init(&pnetwork->list); - - kfree(pnetwork); -} - /* return the wlan_network with the matching addr @@ -349,7 +335,7 @@ __le16 *rtw_get_beacon_interval23a_from_ie(u8 *ie) static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork) { - _rtw_free_network23a_nolock23a(pmlmepriv, pnetwork); + _rtw_free_network23a(pmlmepriv, pnetwork); } int rtw_is_same_ibss23a(struct rtw_adapter *adapter, diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h index 744c15bd6c5a..38203f16aee8 100644 --- a/drivers/staging/rtl8723au/include/rtw_mlme.h +++ b/drivers/staging/rtl8723au/include/rtw_mlme.h @@ -456,9 +456,6 @@ void _rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv); struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); -void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv, - struct wlan_network *pnetwork); - int rtw_if_up23a(struct rtw_adapter *padapter); int rtw_linked_check(struct rtw_adapter *padapter); |