Commit 483557be authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: rtw_os_indicate_connect23a() is only called from one place - fold it in 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce16d2f1

drivers/staging/rtl8723au/core/rtw_mlme.c

+6 −1
Original line number Diff line number Diff line
@@ -908,7 +908,12 @@ void rtw_indicate_connect23a(struct rtw_adapter *padapter) 


		rtw_led_control(padapter, LED_CTL_LINK);



		rtw_os_indicate_connect23a(padapter);

		rtw_cfg80211_indicate_connect(padapter);



		netif_carrier_on(padapter->pnetdev);



		if (padapter->pid[2] != 0)

			kill_pid(find_vpid(padapter->pid[2]), SIGALRM, 1);

	}



	rtw_set_roaming(padapter, 0);

drivers/staging/rtl8723au/include/mlme_osdep.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <drv_types.h>



void rtw_os_indicate_disconnect23a(struct rtw_adapter *adapter);

void rtw_os_indicate_connect23a(struct rtw_adapter *adapter);

void rtw_report_sec_ie23a(struct rtw_adapter *adapter, u8 authmode, u8 *sec_ie);



void rtw_reset_securitypriv23a(struct rtw_adapter *adapter);

drivers/staging/rtl8723au/os_dep/mlme_linux.c

+0 −10
Original line number Diff line number Diff line
@@ -20,16 +20,6 @@ 
#include <mlme_osdep.h>

#include <rtw_ioctl_set.h>



void rtw_os_indicate_connect23a(struct rtw_adapter *adapter)

{

	rtw_cfg80211_indicate_connect(adapter);



	netif_carrier_on(adapter->pnetdev);



	if (adapter->pid[2] != 0)

		kill_pid(find_vpid(adapter->pid[2]), SIGALRM, 1);

}



static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE];



void rtw_reset_securitypriv23a(struct rtw_adapter *adapter)