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

Commit 17d41165 authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Fix unused variable warnings 



A previous set of patches were test compiled with one of the configuration
variables not set. As a result, a number of unused variables were left in the
code.

In several instances, declaration of the unused variable was the only statement
inside ifdef .. endif pairs. In those cases, the entire block was removed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 259cdb5f

drivers/staging/rtl8188eu/core/rtw_ap.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -43,7 +43,6 @@ void init_mlme_ap_info(struct adapter *padapter) 




void free_mlme_ap_info(struct adapter *padapter)

void free_mlme_ap_info(struct adapter *padapter)

{

{

	unsigned long irqL;

	struct sta_info *psta = NULL;

	struct sta_info *psta = NULL;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -275,7 +274,6 @@ static u8 chk_sta_is_alive(struct sta_info *psta) 




void	expire_timeout_chk(struct adapter *padapter)

void	expire_timeout_chk(struct adapter *padapter)

{

{

	unsigned long irqL;

	struct list_head *phead, *plist;

	struct list_head *phead, *plist;

	u8 updated = 0;

	u8 updated = 0;

	struct sta_info *psta = NULL;

	struct sta_info *psta = NULL;
@@ -533,7 +531,6 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) 




static void update_bmc_sta(struct adapter *padapter)

static void update_bmc_sta(struct adapter *padapter)

{

{

	unsigned long	irqL;

	u32 init_rate = 0;

	u32 init_rate = 0;

	unsigned char	network_type, raid;

	unsigned char	network_type, raid;

	int i, supportRateNum = 0;

	int i, supportRateNum = 0;
@@ -620,7 +617,6 @@ static void update_bmc_sta(struct adapter *padapter) 




void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)

void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)

{

{

	unsigned long	irqL;

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct security_priv *psecuritypriv = &padapter->securitypriv;

	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);
@@ -1132,7 +1128,6 @@ void rtw_set_macaddr_acl(struct adapter *padapter, int mode) 




int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)

int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)

{

{

	unsigned long irqL;

	struct list_head *plist, *phead;

	struct list_head *plist, *phead;

	u8 added = false;

	u8 added = false;

	int i, ret = 0;

	int i, ret = 0;
@@ -1198,7 +1193,6 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) 




int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)

int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)

{

{

	unsigned long irqL;

	struct list_head *plist, *phead;

	struct list_head *plist, *phead;

	int ret = 0;

	int ret = 0;

	struct rtw_wlan_acl_node *paclnode;

	struct rtw_wlan_acl_node *paclnode;
@@ -1371,7 +1365,6 @@ static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8 *oui) 




void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)

void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)

{

{

	unsigned long irqL;

	struct mlme_priv *pmlmepriv;

	struct mlme_priv *pmlmepriv;

	struct mlme_ext_priv	*pmlmeext;

	struct mlme_ext_priv	*pmlmeext;
@@ -1503,7 +1496,6 @@ void associated_clients_update(struct adapter *padapter, u8 updated) 
{

{

	/* update associcated stations cap. */

	/* update associcated stations cap. */

	if (updated) {

	if (updated) {

		unsigned long irqL;

		struct list_head *phead, *plist;

		struct list_head *phead, *plist;

		struct sta_info *psta = NULL;

		struct sta_info *psta = NULL;

		struct sta_priv *pstapriv = &padapter->stapriv;

		struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1729,7 +1721,6 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) 
u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta,

u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta,

	       bool active, u16 reason)

	       bool active, u16 reason)

{

{

	unsigned long irqL;

	u8 beacon_updated = false;

	u8 beacon_updated = false;

	struct sta_priv *pstapriv = &padapter->stapriv;

	struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1770,7 +1761,6 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, 




int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)

int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)

{

{

	unsigned long irqL;

	struct list_head *phead, *plist;

	struct list_head *phead, *plist;

	int ret = 0;

	int ret = 0;

	struct sta_info *psta = NULL;

	struct sta_info *psta = NULL;
@@ -1806,7 +1796,6 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset) 




int rtw_sta_flush(struct adapter *padapter)

int rtw_sta_flush(struct adapter *padapter)

{

{

	unsigned long irqL;

	struct list_head *phead, *plist;

	struct list_head *phead, *plist;

	int ret = 0;

	int ret = 0;

	struct sta_info *psta = NULL;

	struct sta_info *psta = NULL;
@@ -1933,7 +1922,6 @@ void start_ap_mode(struct adapter *padapter) 




void stop_ap_mode(struct adapter *padapter)

void stop_ap_mode(struct adapter *padapter)

{

{

	unsigned long irqL;

	struct list_head *phead, *plist;

	struct list_head *phead, *plist;

	struct rtw_wlan_acl_node *paclnode;

	struct rtw_wlan_acl_node *paclnode;

	struct sta_info *psta = NULL;

	struct sta_info *psta = NULL;

drivers/staging/rtl8188eu/core/rtw_debug.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -835,7 +835,6 @@ int proc_get_all_sta_info(char *page, char **start, 
			  off_t offset, int count,

			  off_t offset, int count,

			  int *eof, void *data)

			  int *eof, void *data)

{

{

	unsigned long irqL;

	struct sta_info *psta;

	struct sta_info *psta;

	struct net_device *dev = data;

	struct net_device *dev = data;

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -756,7 +756,6 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) 
unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)

unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)

{

{

#ifdef CONFIG_88EU_AP_MODE

#ifdef CONFIG_88EU_AP_MODE

	unsigned long irqL;

	unsigned int	auth_mode, ie_len;

	unsigned int	auth_mode, ie_len;

	u16 seq;

	u16 seq;

	unsigned char	*sa, *p;

	unsigned char	*sa, *p;
@@ -1005,7 +1004,6 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram 
unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)

unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)

{

{

#ifdef CONFIG_88EU_AP_MODE

#ifdef CONFIG_88EU_AP_MODE

	unsigned long irqL;

	u16 capab_info;

	u16 capab_info;

	struct rtw_ieee802_11_elems elems;

	struct rtw_ieee802_11_elems elems;

	struct sta_info	*pstat;

	struct sta_info	*pstat;
@@ -1590,7 +1588,6 @@ unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame) 




#ifdef CONFIG_88EU_AP_MODE

#ifdef CONFIG_88EU_AP_MODE

	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {

	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {

		unsigned long irqL;

		struct sta_info *psta;

		struct sta_info *psta;

		struct sta_priv *pstapriv = &padapter->stapriv;

		struct sta_priv *pstapriv = &padapter->stapriv;
@@ -1654,7 +1651,6 @@ unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame) 




#ifdef CONFIG_88EU_AP_MODE

#ifdef CONFIG_88EU_AP_MODE

	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {

	if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {

		unsigned long irqL;

		struct sta_info *psta;

		struct sta_info *psta;

		struct sta_priv *pstapriv = &padapter->stapriv;

		struct sta_priv *pstapriv = &padapter->stapriv;
@@ -4483,9 +4479,6 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
	__le16 *fctrl;

	__le16 *fctrl;

	unsigned int	rate_len;

	unsigned int	rate_len;

	struct xmit_priv	*pxmitpriv = &(padapter->xmitpriv);

	struct xmit_priv	*pxmitpriv = &(padapter->xmitpriv);

#if defined(CONFIG_88EU_AP_MODE)

	unsigned long irqL;

#endif /* if defined (CONFIG_88EU_AP_MODE) */

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

	struct mlme_ext_priv	*pmlmeext = &(padapter->mlmeextpriv);

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

	struct mlme_ext_info	*pmlmeinfo = &(pmlmeext->mlmext_info);
@@ -8360,7 +8353,6 @@ u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf) 
	}

	}

#ifdef CONFIG_88EU_AP_MODE

#ifdef CONFIG_88EU_AP_MODE

	else { /* tx bc/mc frames after update TIM */

	else { /* tx bc/mc frames after update TIM */

		unsigned long irqL;

		struct sta_info *psta_bmc;

		struct sta_info *psta_bmc;

		struct list_head *xmitframe_plist, *xmitframe_phead;

		struct list_head *xmitframe_plist, *xmitframe_phead;

		struct xmit_frame *pxmitframe = NULL;

		struct xmit_frame *pxmitframe = NULL;

drivers/staging/rtl8188eu/core/rtw_recv.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1092,7 +1092,6 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, 
		}

		}





		if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid))) {

		if ((psta->state&WIFI_SLEEP_STATE) && (pstapriv->sta_dz_bitmap&BIT(psta->aid))) {

			unsigned long irqL;

			struct list_head *xmitframe_plist, *xmitframe_phead;

			struct list_head *xmitframe_plist, *xmitframe_phead;

			struct xmit_frame *pxmitframe = NULL;

			struct xmit_frame *pxmitframe = NULL;

drivers/staging/rtl8188eu/core/rtw_sta_mgt.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -173,9 +173,6 @@ _func_exit_; 




static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)

static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)

{

{

#ifdef CONFIG_88EU_AP_MODE

	struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;

#endif

	 rtw_mfree_all_stainfo(pstapriv); /* be done before free sta_hash_lock */

	 rtw_mfree_all_stainfo(pstapriv); /* be done before free sta_hash_lock */

}

}
@@ -555,7 +552,6 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) 
{

{

	u8 res = true;

	u8 res = true;

#ifdef CONFIG_88EU_AP_MODE

#ifdef CONFIG_88EU_AP_MODE

	unsigned long irql;

	struct list_head *plist, *phead;

	struct list_head *plist, *phead;

	struct rtw_wlan_acl_node *paclnode;

	struct rtw_wlan_acl_node *paclnode;

	u8 match = false;

	u8 match = false;