Commit c5771c7d authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: remove unused struct wifidirect_info and all corresponding code 



wifidirect_info structure is unused.
Big amount of another definitions used only for wifidirect_info definition.
Remove all.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8ee720f

drivers/staging/rtl8188eu/include/rtw_mlme.h

+0 −177
Original line number Diff line number Diff line
@@ -107,183 +107,6 @@ struct rt_link_detect { 
				       * to Tx traffic. */

};



struct profile_info {

	u8	ssidlen;

	u8	ssid[WLAN_SSID_MAXLEN];

	u8	peermac[ETH_ALEN];

};



struct tx_invite_req_info {

	u8	token;

	u8	benable;

	u8	go_ssid[WLAN_SSID_MAXLEN];

	u8	ssidlen;

	u8	go_bssid[ETH_ALEN];

	u8	peer_macaddr[ETH_ALEN];

	u8	operating_ch;	/* This information will be set by using the

				 * p2p_set op_ch=x */

	u8	peer_ch;	/* The listen channel for peer P2P device */

};



struct tx_invite_resp_info {

	u8	token;	/* Used to record the dialog token of p2p invitation

			 * request frame. */

};



struct tx_provdisc_req_info {

	u16	wps_config_method_request;	/* Used when sending the

						 * provisioning request frame*/

	u16	peer_channel_num[2];		/* The channel number which the

						 * receiver stands. */

	struct ndis_802_11_ssid	ssid;

	u8	peerDevAddr[ETH_ALEN];		/* Peer device address */

	u8	peerIFAddr[ETH_ALEN];		/* Peer interface address */

	u8	benable;			/* This provision discovery

						 * request frame is trigger

						 * to send or not */

};



/* When peer device issue prov_disc_req first, we should store the following

 * information */

/* The UI must know this information to know which config method the

 * remote p2p device needs. */

struct rx_provdisc_req_info {

	u8	peerDevAddr[ETH_ALEN];		/* Peer device address */

	u8	strconfig_method_desc_of_prov_disc_req[4];	/* description

			* for the config method located in the provisioning

			* discovery request frame. */

};



struct tx_nego_req_info {

	u16	peer_channel_num[2];	/* The channel number. */

	u8	peerDevAddr[ETH_ALEN];	/* Peer device address */

	u8	benable;		/* This negotiation request frame is

					 * trigger to send or not */

};



struct group_id_info {

	u8	go_device_addr[ETH_ALEN];	/* The GO's device address of

						 * this P2P group */

	u8	ssid[WLAN_SSID_MAXLEN];	/* The SSID of this P2P group */

};



struct scan_limit_info {

	u8	scan_op_ch_only;	/* When this flag is set, the driver

					 * should only scan the op. channel */

	u8	operation_ch[2];	/* Store the op. chan of invitation */

};



struct wifidirect_info {

	struct adapter *padapter;

	struct timer_list find_phase_timer;

	struct timer_list restore_p2p_state_timer;



	/* Used to do the scanning. After confirming the peer is availalble,

	 * the driver transmits the P2P frame to peer. */

	struct timer_list pre_tx_scan_timer;

	struct timer_list reset_ch_sitesurvey;

	struct timer_list reset_ch_sitesurvey2;	/* Just for resetting the scan

					 * limit function by using p2p nego */

	struct tx_provdisc_req_info	tx_prov_disc_info;

	struct rx_provdisc_req_info rx_prov_disc_info;

	struct tx_invite_req_info	invitereq_info;

	/* Store the profile information of persistent group */

	struct profile_info profileinfo[P2P_MAX_PERSISTENT_GROUP_NUM];

	struct tx_invite_resp_info	inviteresp_info;

	struct tx_nego_req_info	nego_req_info;

	/* Store the group id info when doing the group negot handshake. */

	struct group_id_info groupid_info;

	/* Used for get the limit scan channel from the Invitation procedure */

	struct scan_limit_info rx_invitereq_info;

	/* Used for get the limit scan chan from the P2P negotiation handshake*/

	struct scan_limit_info p2p_info;

	enum P2P_ROLE role;

	enum P2P_STATE pre_p2p_state;

	enum P2P_STATE p2p_state;

	/* The device address should be the mac address of this device. */

	u8 device_addr[ETH_ALEN];

	u8 interface_addr[ETH_ALEN];

	u8 social_chan[4];

	u8 listen_channel;

	u8 operating_channel;

	u8 listen_dwell;	/* This value should be between 1 and 3 */

	u8 support_rate[8];

	u8 p2p_wildcard_ssid[P2P_WILDCARD_SSID_LEN];

	u8 intent;	/* should only include the intent value. */

	u8 p2p_peer_interface_addr[ETH_ALEN];

	u8 p2p_peer_device_addr[ETH_ALEN];

	u8 peer_intent;	/* Included the intent value and tie breaker value. */

	/* Device name for displaying on searching device screen */

	u8 device_name[WPS_MAX_DEVICE_NAME_LEN];

	u8 device_name_len;

	u8 profileindex; /* Used to point to the index of profileinfo array */

	u8 peer_operating_ch;

	u8 find_phase_state_exchange_cnt;

	/* The device password ID for group negotiation */

	u16 device_password_id_for_nego;

	u8 negotiation_dialog_token;

	/* SSID information for group negotitation */

	u8 nego_ssid[WLAN_SSID_MAXLEN];

	u8 nego_ssidlen;

	u8 p2p_group_ssid[WLAN_SSID_MAXLEN];

	u8 p2p_group_ssid_len;

	/* Flag to know if the persistent function should be supported or not.*/

	u8 persistent_supported;

	/* In the Sigma test, the Sigma will provide this enable from the

	 * sta_set_p2p CAPI. */

	/*	0: disable */

	/*	1: enable */

	u8 session_available;	/* Flag to set the WFD session available to

				 * enable or disable "by Sigma" */

	/* In the Sigma test, the Sigma will disable the session available

	 * by using the sta_preset CAPI. */

	/*	0: disable */

	/*	1: enable */

	u8 wfd_tdls_enable; /* Flag to enable or disable the TDLS by WFD Sigma*/

			    /* 0: disable */

			    /*	1: enable */

	u8 wfd_tdls_weaksec; /* Flag to enable or disable the weak security

			      * function for TDLS by WFD Sigma */

			     /* 0: disable */

			     /* In this case, the driver can't issue the tdsl

			      * setup request frame. */

			     /*	1: enable */

			     /* In this case, the driver can issue the tdls

			      * setup request frame */

			     /*	even the current security is weak security. */



	/* This field will store the WPS value (PIN value or PBC) that UI had

	 * got from the user. */

	enum	P2P_WPSINFO ui_got_wps_info;

	u16 supported_wps_cm;	/* This field describes the WPS config method

				 * which this driver supported. */

				/* The value should be the combination of config

				 * method defined in page104 of WPS v2.0 spec.*/

	/* This field will contain the length of body of P2P Channel List

	 * attribute of group negotiation response frame. */

	uint channel_list_attr_len;

	/* This field will contain the body of P2P Channel List attribute of

	 * group negotitation response frame. */

	/* We will use the channel_cnt and channel_list fields when constructing

	 * the group negotiation confirm frame. */

	u8 channel_list_attr[100];

	enum P2P_PS_MODE p2p_ps_mode; /*  indicate p2p ps mode */

	enum P2P_PS_STATE p2p_ps_state; /*  indicate p2p ps state */

	u8 noa_index; /*  Identifies and instance of Notice of Absence timing. */

	u8 ctwindow; /*  Client traffic window. A period of time in TU after TBTT. */

	u8 opp_ps; /*  opportunistic power save. */

	u8 noa_num; /*  number of NoA descriptor in P2P IE. */

	u8 noa_count[P2P_MAX_NOA_NUM]; /*  Count for owner, Type of client. */

	/* Max duration for owner, preferred or min acceptable duration for

	 * client. */

	u32 noa_duration[P2P_MAX_NOA_NUM];

	/* Length of interval for owner, preferred or max acceptable interval

	 * of client. */

	u32 noa_interval[P2P_MAX_NOA_NUM];

	/* schedule expressed in terms of the lower 4 bytes of the TSF timer. */

	u32 noa_start_time[P2P_MAX_NOA_NUM];

};



struct mlme_priv {

	spinlock_t lock;

	int fw_state;	/* shall we protect this variable? maybe not necessarily... */

drivers/staging/rtl8188eu/include/wifi.h

+0 −84
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#define WLAN_HDR_A4_LEN		30

#define WLAN_HDR_A3_QOS_LEN	26

#define WLAN_HDR_A4_QOS_LEN	32

#define WLAN_SSID_MAXLEN	32

#define WLAN_DATA_MAXLEN	2312



#define WLAN_A3_PN_OFFSET	24
@@ -644,9 +643,6 @@ enum ht_cap_ampdu_factor { 
#define WPS_ATTR_VENDOR_EXT			0x1049

#define WPS_ATTR_SELECTED_REGISTRAR		0x1041



/*	Value of WPS attribute "WPS_ATTR_DEVICE_NAME */

#define WPS_MAX_DEVICE_NAME_LEN			32



/*	Value of WPS Request Type Attribute */

#define WPS_REQ_TYPE_ENROLLEE_INFO_ONLY		0x00

#define WPS_REQ_TYPE_ENROLLEE_OPEN_8021X	0x01
@@ -787,13 +783,8 @@ enum ht_cap_ampdu_factor { 
#define	P2P_PRESENCE_RESPONSE			2

#define	P2P_GO_DISC_REQUEST			3





#define	P2P_MAX_PERSISTENT_GROUP_NUM		10



#define	P2P_PROVISIONING_SCAN_CNT		3



#define	P2P_WILDCARD_SSID_LEN			7



/* default value, used when: (1)p2p disabled or (2)p2p enabled

 * but only do 1 scan phase */

#define	P2P_FINDPHASE_EX_NONE		0
@@ -822,8 +813,6 @@ enum ht_cap_ampdu_factor { 
#define	P2P_RESET_SCAN_CH		25000

#define	P2P_MAX_INTENT			15



#define	P2P_MAX_NOA_NUM			2



/*	WPS Configuration Method */

#define	WPS_CM_NONE			0x0000

#define	WPS_CM_LABEL			0x0004
@@ -838,64 +827,6 @@ enum ht_cap_ampdu_factor { 
#define	WPS_CM_SW_DISPLAY_P		0x2008

#define	WPS_CM_LCD_DISPLAY_P		0x4008



enum P2P_ROLE {

	P2P_ROLE_DISABLE = 0,

	P2P_ROLE_DEVICE = 1,

	P2P_ROLE_CLIENT = 2,

	P2P_ROLE_GO = 3

};



enum P2P_STATE {

	P2P_STATE_NONE = 0,			/* P2P disable */

	/* P2P had enabled and do nothing */

	P2P_STATE_IDLE = 1,

	P2P_STATE_LISTEN = 2,			/* In pure listen state */

	P2P_STATE_SCAN = 3,			/* In scan phase */

	/* In the listen state of find phase */

	P2P_STATE_FIND_PHASE_LISTEN = 4,

	/* In the search state of find phase */

	P2P_STATE_FIND_PHASE_SEARCH = 5,

	/* In P2P provisioning discovery */

	P2P_STATE_TX_PROVISION_DIS_REQ = 6,

	P2P_STATE_RX_PROVISION_DIS_RSP = 7,

	P2P_STATE_RX_PROVISION_DIS_REQ = 8,

	/* Doing the group owner negotiation handshake */

	P2P_STATE_GONEGO_ING = 9,

	/* finish the group negotiation handshake with success */

	P2P_STATE_GONEGO_OK = 10,

	/* finish the group negotiation handshake with failure */

	P2P_STATE_GONEGO_FAIL = 11,

	/* receiving the P2P Invitation request and match with the profile. */

	P2P_STATE_RECV_INVITE_REQ_MATCH = 12,

	/* Doing the P2P WPS */

	P2P_STATE_PROVISIONING_ING = 13,

	/* Finish the P2P WPS */

	P2P_STATE_PROVISIONING_DONE = 14,

	/* Transmit the P2P Invitation request */

	P2P_STATE_TX_INVITE_REQ = 15,

	/* Receiving the P2P Invitation response */

	P2P_STATE_RX_INVITE_RESP_OK = 16,

	/* receiving the P2P Invitation request and dismatch with the profile. */

	P2P_STATE_RECV_INVITE_REQ_DISMATCH = 17,

	/* receiving the P2P Invitation request and this wifi is GO. */

	P2P_STATE_RECV_INVITE_REQ_GO = 18,

	/* receiving the P2P Invitation request to join an existing P2P Group. */

	P2P_STATE_RECV_INVITE_REQ_JOIN = 19,

	/* receiving the P2P Invitation response with failure */

	P2P_STATE_RX_INVITE_RESP_FAIL = 20,

	/* receiving p2p negotiation response with information is not available */

	P2P_STATE_RX_INFOR_NOREADY = 21,

	/* sending p2p negotiation response with information is not available */

	P2P_STATE_TX_INFOR_NOREADY = 22,

};



enum P2P_WPSINFO {

	P2P_NO_WPSINFO				= 0,

	P2P_GOT_WPSINFO_PEER_DISPLAY_PIN	= 1,

	P2P_GOT_WPSINFO_SELF_DISPLAY_PIN	= 2,

	P2P_GOT_WPSINFO_PBC			= 3,

};



#define	P2P_PRIVATE_IOCTL_SET_LEN		64



enum P2P_PROTO_WK_ID {
@@ -908,21 +839,6 @@ enum P2P_PROTO_WK_ID { 
	P2P_RO_CH_WK = 6,

};



enum P2P_PS_STATE {

	P2P_PS_DISABLE = 0,

	P2P_PS_ENABLE = 1,

	P2P_PS_SCAN = 2,

	P2P_PS_SCAN_DONE = 3,

	P2P_PS_ALLSTASLEEP = 4, /*  for P2P GO */

};



enum P2P_PS_MODE {

	P2P_PS_NONE = 0,

	P2P_PS_CTWINDOW = 1,

	P2P_PS_NOA	 = 2,

	P2P_PS_MIX = 3, /*  CTWindow and NoA */

};



/*	=====================WFD Section===================== */

/*	For Wi-Fi Display */

#define	WFD_ATTR_DEVICE_INFO		0x00