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

Commit 3c98d810 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: rtw_cmd.h: Remove struct [join, create]bss_parm 



These two structures have only one member.

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4ef0fa75

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+5 −5
Original line number Diff line number Diff line
@@ -4959,11 +4959,11 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) 
	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

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

	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));

	struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;

	struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf;

	/* u32	initialgain; */





	if (pparm->network.InfrastructureMode == Ndis802_11APMode) {

	if (pparm->InfrastructureMode == Ndis802_11APMode) {

#ifdef CONFIG_88EU_AP_MODE



		if (pmlmeinfo->state == WIFI_FW_AP_STATE) {
@@ -4974,7 +4974,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) 
	}



	/* below is for ad-hoc master */

	if (pparm->network.InfrastructureMode == Ndis802_11IBSS) {

	if (pparm->InfrastructureMode == Ndis802_11IBSS) {

		rtw_joinbss_reset(padapter);



		pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20;
@@ -5023,7 +5023,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
	struct mlme_ext_priv	*pmlmeext = &padapter->mlmeextpriv;

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

	struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));

	struct joinbss_parm	*pparm = (struct joinbss_parm *)pbuf;

	struct wlan_bssid_ex *pparm = (struct wlan_bssid_ex *)pbuf;

	u32 i;



	/* check already connecting to AP or not */
@@ -5045,7 +5045,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
		rtw_hal_set_hwreg(padapter, HW_VAR_MLME_DISCONNECT, NULL);

	}



	rtw_antenna_select_cmd(padapter, pparm->network.PhyInfo.Optimum_antenna, false);

	rtw_antenna_select_cmd(padapter, pparm->PhyInfo.Optimum_antenna, false);



	rtw_joinbss_reset(padapter);

drivers/staging/rtl8188eu/include/rtw_cmd.h

+0 −23
Original line number Diff line number Diff line
@@ -110,18 +110,6 @@ enum RFINTFS { 
	HWPI,

};



/*

Caller Mode: Infra, Ad-Hoc



Notes: To join the specified bss



Command Event Mode



*/

struct joinbss_parm {

	struct wlan_bssid_ex network;

};



/*

Caller Mode: Infra, Ad-HoC(C)
@@ -134,17 +122,6 @@ struct disconnect_parm { 
	u32 deauth_timeout_ms;

};



/*

Caller Mode: AP, Ad-HoC(M)



Notes: To create a BSS



Command Mode

*/

struct createbss_parm {

	struct wlan_bssid_ex network;

};



struct	setopmode_parm {

	u8	mode;

	u8	rsvd[3];

drivers/staging/rtl8188eu/include/rtw_mlme_ext.h

+2 −2
Original line number Diff line number Diff line
@@ -722,9 +722,9 @@ static struct cmd_hdl wlancmds[] = { 
	GEN_MLME_EXT_HANDLER(0, NULL)

	GEN_MLME_EXT_HANDLER(0, NULL)

	GEN_MLME_EXT_HANDLER(0, NULL)

	GEN_MLME_EXT_HANDLER(sizeof (struct joinbss_parm), join_cmd_hdl) /*14*/

	GEN_MLME_EXT_HANDLER(sizeof (struct wlan_bssid_ex), join_cmd_hdl) /*14*/

	GEN_MLME_EXT_HANDLER(sizeof (struct disconnect_parm), disconnect_hdl)

	GEN_MLME_EXT_HANDLER(sizeof (struct createbss_parm), createbss_hdl)

	GEN_MLME_EXT_HANDLER(sizeof (struct wlan_bssid_ex), createbss_hdl)

	GEN_MLME_EXT_HANDLER(sizeof (struct setopmode_parm), setopmode_hdl)

	GEN_MLME_EXT_HANDLER(sizeof (struct sitesurvey_parm),

			     sitesurvey_cmd_hdl) /*18*/