From 68345dd7bc26f6bd182ba0ceb890041a484bac44 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Fri, 12 Jun 2015 00:20:44 +0200 Subject: [PATCH] staging: rtl8188eu: rtw_mlme_ext.c: unexport message callbacks These are internal functions. Remove their declaration in rtw_mlme_ext.h and make them static. Signed-off-by: Luca Ceresoli Cc: Larry Finger Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 60 ++++++++++++------- .../staging/rtl8188eu/include/rtw_mlme_ext.h | 42 ------------- 2 files changed, 40 insertions(+), 62 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c index 0d1d4bfc6474..5adbbd715231 100644 --- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c @@ -2569,7 +2569,8 @@ Following are the callback functions for each subtype of the management frames *****************************************************************************/ -unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnProbeReq(struct adapter *padapter, + struct recv_frame *precv_frame) { unsigned int ielen; unsigned char *p; @@ -2609,7 +2610,8 @@ unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame *precv_frame return _SUCCESS; } -unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnProbeRsp(struct adapter *padapter, + struct recv_frame *precv_frame) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -2621,7 +2623,8 @@ unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame *precv_frame return _SUCCESS; } -unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnBeacon(struct adapter *padapter, + struct recv_frame *precv_frame) { int cam_idx; struct sta_info *psta; @@ -2711,7 +2714,8 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) return _SUCCESS; } -unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAuth(struct adapter *padapter, + struct recv_frame *precv_frame) { #ifdef CONFIG_88EU_AP_MODE unsigned int auth_mode, ie_len; @@ -2880,7 +2884,8 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) return _FAIL; } -unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAuthClient(struct adapter *padapter, + struct recv_frame *precv_frame) { unsigned int seq, len, status, offset; unsigned char *p; @@ -2955,7 +2960,8 @@ unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fra return _FAIL; } -unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAssocReq(struct adapter *padapter, + struct recv_frame *precv_frame) { #ifdef CONFIG_88EU_AP_MODE u16 capab_info; @@ -3393,7 +3399,8 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame return _FAIL; } -unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAssocRsp(struct adapter *padapter, + struct recv_frame *precv_frame) { uint i; int res; @@ -3483,7 +3490,8 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frame return _SUCCESS; } -unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnDeAuth(struct adapter *padapter, + struct recv_frame *precv_frame) { unsigned short reason; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3537,7 +3545,8 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) return _SUCCESS; } -unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnDisassoc(struct adapter *padapter, + struct recv_frame *precv_frame) { u16 reason; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3590,13 +3599,15 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame return _SUCCESS; } -unsigned int OnAtim(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAtim(struct adapter *padapter, + struct recv_frame *precv_frame) { DBG_88E("%s\n", __func__); return _SUCCESS; } -unsigned int on_action_spct(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int on_action_spct(struct adapter *padapter, + struct recv_frame *precv_frame) { struct sta_info *psta = NULL; struct sta_priv *pstapriv = &padapter->stapriv; @@ -3633,17 +3644,20 @@ unsigned int on_action_spct(struct adapter *padapter, struct recv_frame *precv_f return _FAIL; } -unsigned int OnAction_qos(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction_qos(struct adapter *padapter, + struct recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_dls(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction_dls(struct adapter *padapter, + struct recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction_back(struct adapter *padapter, + struct recv_frame *precv_frame) { u8 *addr; struct sta_info *psta = NULL; @@ -3799,7 +3813,8 @@ static unsigned int on_action_public_default(struct recv_frame *precv_frame, u8 return ret; } -unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int on_action_public(struct adapter *padapter, + struct recv_frame *precv_frame) { unsigned int ret = _FAIL; u8 *pframe = precv_frame->rx_data; @@ -3828,22 +3843,26 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precv return ret; } -unsigned int OnAction_ht(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction_ht(struct adapter *padapter, + struct recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_wmm(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction_wmm(struct adapter *padapter, + struct recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction_p2p(struct adapter *padapter, + struct recv_frame *precv_frame) { return _SUCCESS; } -unsigned int DoReserved(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int DoReserved(struct adapter *padapter, + struct recv_frame *precv_frame) { return _SUCCESS; } @@ -3862,7 +3881,8 @@ static struct action_handler OnAction_tbl[] = { {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p}, }; -unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction(struct adapter *padapter, + struct recv_frame *precv_frame) { int i; unsigned char category; diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h index 1df586aa0a9a..81df31ed6018 100644 --- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h @@ -604,48 +604,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); -unsigned int OnAssocReq(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAssocRsp(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnProbeReq(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnProbeRsp(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int DoReserved(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnBeacon(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAtim(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnDisassoc(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAuth(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAuthClient(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnDeAuth(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction(struct adapter *padapter, - struct recv_frame *precv_frame); - -unsigned int on_action_spct(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction_qos(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction_dls(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction_back(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int on_action_public(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction_ht(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction_wmm(struct adapter *padapter, - struct recv_frame *precv_frame); -unsigned int OnAction_p2p(struct adapter *padapter, - struct recv_frame *precv_frame); - void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res); void mlmeext_sta_del_event_callback(struct adapter *padapter); void mlmeext_sta_add_event_callback(struct adapter *padapter, -- GitLab