staging: rtl8723au: Move rtw_do_join23a() prototype to rtw_ioctl_set.h

rtw_do_join23a() is declared in rtw_ioctl_set.c so move the prototype
to it's correct place, and remove duplicate protoype from rtw_mlme.c

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 48b6d4ba3915315e4c0fc59be089e49b7887e307..b562bd6564a9957968b42dc35806c043efbe0f95 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -26,8 +26,6 @@
 #include <wlan_bssdef.h>
 #include <rtw_ioctl_set.h>
 
-extern u8 rtw_do_join23a(struct rtw_adapter * padapter);
-
 static void rtw_init_mlme_timer(struct rtw_adapter *padapter)
 {
        struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;

diff --git a/drivers/staging/rtl8723au/include/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h
index be9329f14f7a38c40527bb5060645b705cb9f19b..f2a8d2acf789e9bbdaa60cd683cae3c3c13d76ea 100644 (file)
--- a/drivers/staging/rtl8723au/include/osdep_service.h
+++ b/drivers/staging/rtl8723au/include/osdep_service.h
@@ -139,6 +139,5 @@ void        _rtw_init_queue23a(struct rtw_queue *pqueue);
                         ((u32) (a)[2]))
 
 s32 c2h_evt_hdl(struct rtw_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
-u8 rtw_do_join23a(struct rtw_adapter *padapter);
 
 #endif

diff --git a/drivers/staging/rtl8723au/include/rtw_ioctl_set.h b/drivers/staging/rtl8723au/include/rtw_ioctl_set.h
index 8e49be5fcdda264b801c8ee2e58c215cea89ffcb..e18820012edc39d43e93146730e98eabd8b778e1 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723au/include/rtw_ioctl_set.h
@@ -29,5 +29,6 @@ u8 rtw_set_802_11_ssid23a(struct rtw_adapter * padapter, struct cfg80211_ssid *
 
 u16 rtw_get_cur_max_rate23a(struct rtw_adapter *adapter);
 s32 FillH2CCmd(struct rtw_adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer);
+u8 rtw_do_join23a(struct rtw_adapter *padapter);
 
 #endif