From: Jes Sorensen Date: Fri, 9 May 2014 13:04:08 +0000 (+0200) Subject: staging: rtl8723au: Move rtw_do_join23a() prototype to rtw_ioctl_set.h X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~953 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=95b0f200082e96aed935943450184fb288238618;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index 48b6d4ba3915..b562bd6564a9 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -26,8 +26,6 @@ #include #include -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 be9329f14f7a..f2a8d2acf789 100644 --- 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 8e49be5fcdda..e18820012edc 100644 --- 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