Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 782eddd7 authored by Luca Ceresoli's avatar Luca Ceresoli Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: unexport internal functions 



These are internal functions. Remove their declaration in rtw_mlme_ext.h
and make them static.

Signed-off-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68345dd7

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+36 −21
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattri 
	pattrib->retry_ctrl = true;

}



void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)

static void dump_mgntframe(struct adapter *padapter,

			   struct xmit_frame *pmgntframe)

{

	if (padapter->bSurpriseRemoved || padapter->bDriverStopped)

		return;
@@ -238,7 +239,9 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe) 
	rtw_hal_mgnt_xmit(padapter, pmgntframe);

}



s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)

static s32 dump_mgntframe_and_wait(struct adapter *padapter,

				   struct xmit_frame *pmgntframe,

				   int timeout_ms)

{

	s32 ret = _FAIL;

	struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
@@ -258,7 +261,8 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr 
	return ret;

}



s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe)

static s32 dump_mgntframe_and_wait_ack(struct adapter *padapter,

				       struct xmit_frame *pmgntframe)

{

	s32 ret = _FAIL;

	u32 timeout_ms = 500;/*   500ms */
@@ -314,7 +318,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) 
	return len_diff;

}



void issue_beacon(struct adapter *padapter, int timeout_ms)

static void issue_beacon(struct adapter *padapter, int timeout_ms)

{

	struct xmit_frame	*pmgntframe;

	struct pkt_attrib	*pattrib;
@@ -455,7 +459,8 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
		dump_mgntframe(padapter, pmgntframe);

}



void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq)

static void issue_probersp(struct adapter *padapter, unsigned char *da,

			   u8 is_valid_p2p_probereq)

{

	struct xmit_frame			*pmgntframe;

	struct pkt_attrib			*pattrib;
@@ -697,12 +702,14 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps 
	return ret;

}



inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)

static inline void issue_probereq(struct adapter *padapter,

				  struct ndis_802_11_ssid *pssid, u8 *da)

{

	_issue_probereq(padapter, pssid, da, false);

}



int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da,

static int issue_probereq_ex(struct adapter *padapter,

			     struct ndis_802_11_ssid *pssid, u8 *da,

			     int try_cnt, int wait_ms)

{

	int ret;
@@ -742,7 +749,8 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, 
}



/*  if psta == NULL, indicate we are station(client) now... */

void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status)

static void issue_auth(struct adapter *padapter, struct sta_info *psta,

		       unsigned short status)

{

	struct xmit_frame *pmgntframe;

	struct pkt_attrib *pattrib;
@@ -881,7 +889,8 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short 
}





void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type)

static void issue_asocrsp(struct adapter *padapter, unsigned short status,

			  struct sta_info *pstat, int pkt_type)

{

#ifdef CONFIG_88EU_AP_MODE

	struct xmit_frame	*pmgntframe;
@@ -1006,7 +1015,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i 
#endif

}



void issue_assocreq(struct adapter *padapter)

static void issue_assocreq(struct adapter *padapter)

{

	int ret = _FAIL;

	struct xmit_frame	*pmgntframe;
@@ -1513,7 +1522,8 @@ int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short rea 
	return _issue_deauth(padapter, da, reason, false);

}



int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int try_cnt,

static int issue_deauth_ex(struct adapter *padapter, u8 *da,

			   unsigned short reason, int try_cnt,

			   int wait_ms)

{

	int ret;
@@ -1611,7 +1621,8 @@ void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 
	dump_mgntframe(padapter, pmgntframe);

}



void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status)

static void issue_action_BA(struct adapter *padapter, unsigned char *raddr,

			    unsigned char action, unsigned short status)

{

	u8 category = RTW_WLAN_CATEGORY_BACK;

	u16 start_seq;
@@ -1963,7 +1974,7 @@ Following are some utility functions for WiFi MLME 


*****************************************************************************/



void site_survey(struct adapter *padapter)

static void site_survey(struct adapter *padapter)

{

	unsigned char		survey_channel = 0, val8;

	enum rt_scan_type ScanType = SCAN_PASSIVE;
@@ -2067,7 +2078,9 @@ void site_survey(struct adapter *padapter) 
}



/* collect bss info from Beacon and Probe request/response frames. */

u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, struct wlan_bssid_ex *bssid)

static u8 collect_bss_info(struct adapter *padapter,

			   struct recv_frame *precv_frame,

			   struct wlan_bssid_ex *bssid)

{

	int	i;

	u32	len;
@@ -2233,7 +2246,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, st 
	return _SUCCESS;

}



void start_create_ibss(struct adapter *padapter)

static void start_create_ibss(struct adapter *padapter)

{

	unsigned short	caps;

	u8 val8;
@@ -2284,7 +2297,7 @@ void start_create_ibss(struct adapter *padapter) 
	}

}



void start_clnt_join(struct adapter *padapter)

static void start_clnt_join(struct adapter *padapter)

{

	unsigned short	caps;

	u8 val8;
@@ -2339,7 +2352,7 @@ void start_clnt_join(struct adapter *padapter) 
	}

}



void start_clnt_auth(struct adapter *padapter)

static void start_clnt_auth(struct adapter *padapter)

{

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -2370,7 +2383,7 @@ void start_clnt_auth(struct adapter *padapter) 
}





void start_clnt_assoc(struct adapter *padapter)

static void start_clnt_assoc(struct adapter *padapter)

{

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -2385,7 +2398,9 @@ void start_clnt_assoc(struct adapter *padapter) 
	set_link_timer(pmlmeext, REASSOC_TO);

}



unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason)

static unsigned int receive_disconnect(struct adapter *padapter,

				       unsigned char *MacAddr,

				       unsigned short reason)

{

	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);

drivers/staging/rtl8188eu/include/rtw_mlme_ext.h

+1 −33
Original line number Diff line number Diff line
@@ -497,9 +497,6 @@ void CAM_empty_entry(struct adapter *Adapter, u8 ucIndex); 
int allocate_fw_sta_entry(struct adapter *padapter);

void flush_all_cam_entry(struct adapter *padapter);



void site_survey(struct adapter *padapter);

u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame,

		    struct wlan_bssid_ex *bssid);

void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,

		    struct adapter *adapter, bool update_ie);
@@ -541,9 +538,6 @@ unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps); 
void Update_RA_Entry(struct adapter *padapter, u32 mac_id);

void set_sta_rate(struct adapter *padapter, struct sta_info *psta);



unsigned int receive_disconnect(struct adapter *padapter,

				unsigned char *macaddr, unsigned short reason);



unsigned char get_highest_rate_idx(u32 mask);

int support_short_GI(struct adapter *padapter, struct HT_caps_element *caps);

unsigned int is_ap_in_tkip(struct adapter *padapter);
@@ -566,44 +560,18 @@ unsigned int setup_beacon_frame(struct adapter *padapter, 
void update_mgnt_tx_rate(struct adapter *padapter, u8 rate);

void update_mgntframe_attrib(struct adapter *padapter,

			     struct pkt_attrib *pattrib);

void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe);

s32 dump_mgntframe_and_wait(struct adapter *padapter,

			    struct xmit_frame *pmgntframe, int timeout_ms);

s32 dump_mgntframe_and_wait_ack(struct adapter *padapter,

				struct xmit_frame *pmgntframe);



void issue_beacon(struct adapter *padapter, int timeout_ms);

void issue_probersp(struct adapter *padapter, unsigned char *da,

		    u8 is_valid_p2p_probereq);

void issue_assocreq(struct adapter *padapter);

void issue_asocrsp(struct adapter *padapter, unsigned short status,

		   struct sta_info *pstat, int pkt_type);

void issue_auth(struct adapter *padapter, struct sta_info *psta,

		unsigned short status);

void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid,

		    u8 *da);

s32 issue_probereq_ex(struct adapter *adapter, struct ndis_802_11_ssid *pssid,

		      u8 *da, int try_cnt, int wait_ms);



int issue_nulldata(struct adapter *padapter, unsigned char *da,

		   unsigned int power_mode, int try_cnt, int wait_ms);

int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,

		       u16 tid, int try_cnt, int wait_ms);

int issue_deauth(struct adapter *padapter, unsigned char *da,

		 unsigned short reason);

int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason,

		    int try_cnt, int wait_ms);

void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch,

				 u8 ch_offset);

void issue_action_BA(struct adapter *padapter, unsigned char *raddr,

		     unsigned char action, unsigned short status);

unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr);

unsigned int send_beacon(struct adapter *padapter);



void start_clnt_assoc(struct adapter *padapter);

void start_clnt_auth(struct adapter *padapter);

void start_clnt_join(struct adapter *padapter);

void start_create_ibss(struct adapter *padapter);



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,