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

staging: rtl8188eu: Remove pbuddy_adapter from struct adapter 



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

drivers/staging/rtl8188eu/core/rtw_pwrctrl.c

+0 −19
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ int ips_leave(struct adapter *padapter) 


static bool rtw_pwr_unassociated_idle(struct adapter *adapter)

{

	struct adapter *buddy = adapter->pbuddy_adapter;

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

#ifdef CONFIG_88EU_P2P

	struct wifidirect_info	*pwdinfo = &(adapter->wdinfo);
@@ -136,24 +135,6 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter) 
#endif

		goto exit;



	/* consider buddy, if exist */

	if (buddy) {

		struct mlme_priv *b_pmlmepriv = &(buddy->mlmepriv);

		#ifdef CONFIG_88EU_P2P

		struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo);

		#endif



		if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) ||

		    check_fwstate(b_pmlmepriv, WIFI_UNDER_LINKING|WIFI_UNDER_WPS) ||

		    check_fwstate(b_pmlmepriv, WIFI_AP_STATE) ||

		    check_fwstate(b_pmlmepriv, WIFI_ADHOC_MASTER_STATE|WIFI_ADHOC_STATE) ||

#if defined(CONFIG_88EU_P2P)

		    !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE))

#else

		    0)

#endif

			goto exit;

	}

	ret = true;



exit:

drivers/staging/rtl8188eu/include/drv_types.h

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ struct adapter { 
	 * upper application reads it. */

	u8 bShowGetP2PState;

#endif

	struct adapter *pbuddy_adapter;



	struct mutex hw_init_mutex;

drivers/staging/rtl8188eu/os_dep/os_intfs.c

+0 −4
Original line number Diff line number Diff line
@@ -993,10 +993,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter) 
		padapter->rereg_nd_name_priv.old_pnetdev = NULL;

	}



	/*  clear pbuddystruct adapter to avoid access wrong pointer. */

	if (padapter->pbuddy_adapter != NULL)

		padapter->pbuddy_adapter->pbuddy_adapter = NULL;



	mutex_destroy(&padapter->hw_init_mutex);



	RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-rtw_free_drv_sw\n"));