staging: rtl8723au: Fold _rtw_find_network23a() into rtw_find_network23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 8ae2bbf590b2e434d56ce457410150a9768a67da..536250476566660a964b9a1b8eace7aac4278968 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -186,7 +186,7 @@ void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv,
  Shall be calle under atomic context... to avoid possible racing condition...
 */
 struct wlan_network *
-_rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)
+rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)
 {
        struct list_head *phead, *plist;
        struct wlan_network *pnetwork = NULL;
@@ -358,21 +358,6 @@ static void rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
        _rtw_free_network23a_nolock23a(pmlmepriv, pnetwork);
 }
 
-/*
- return the wlan_network with the matching addr
-
- Shall be calle under atomic context... to avoid possible racing condition...
-*/
-struct wlan_network *
-rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr)
-{
-       struct wlan_network *pnetwork;
-
-       pnetwork = _rtw_find_network23a(scanned_queue, addr);
-
-       return pnetwork;
-}
-
 int rtw_is_same_ibss23a(struct rtw_adapter *adapter,
                        struct wlan_network *pnetwork)
 {

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index 29ffcbbd5764a0649e2752e21188ca58184c20c9..b1aca7d6244a66c64d19c2793831c61499a9e096 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -459,8 +459,6 @@ struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv);
 void _rtw_free_network23a_nolock23a(struct mlme_priv *pmlmepriv,
                              struct wlan_network *pnetwork);
 
-struct wlan_network *_rtw_find_network23a(struct rtw_queue *scanned_queue, u8 *addr);
-
 int rtw_if_up23a(struct rtw_adapter *padapter);
 
 int rtw_linked_check(struct rtw_adapter *padapter);