staging: rtl8723au: rtw_os_indicate_connect23a() is only called from one place -...

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 8d45c1c841ef75a9d286327a6345b5d54eea0f09..4846768809c10502b7cf74e6cd324a250170fc3c 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -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);

diff --git a/drivers/staging/rtl8723au/include/mlme_osdep.h b/drivers/staging/rtl8723au/include/mlme_osdep.h
index 82584dad18646a828c1aecbc3cd663d5cb835b32..e2cae3d635272cff1eb2cfc114fd681da2d654d0 100644 (file)
--- a/drivers/staging/rtl8723au/include/mlme_osdep.h
+++ b/drivers/staging/rtl8723au/include/mlme_osdep.h
@@ -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);

diff --git a/drivers/staging/rtl8723au/os_dep/mlme_linux.c b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
index d07e2203950cc839314f5c9294dacfd00832fad5..73a54a4ae792846ee2d6550357b12f64ed35cde8 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8723au/os_dep/mlme_linux.c
@@ -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)