52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Mon, 9 Jun 2014 15:16:54 +0200
|
|
Subject: [075/249] staging: rtl8723au: Remove no-op
|
|
rtw_get_encrypt_decrypt_from_registrypriv23a()
|
|
Origin: https://git.kernel.org/linus/3221bb536d92967ac204424140699a4fc23e0ac5
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/rtl8723au/core/rtw_mlme.c | 7 -------
|
|
drivers/staging/rtl8723au/include/rtw_mlme.h | 2 --
|
|
2 files changed, 9 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
index 81693c1..efb2161 100644
|
|
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
@@ -1151,8 +1151,6 @@ void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf)
|
|
("joinbss event call back received with res=%d\n",
|
|
pnetwork->join_res));
|
|
|
|
- rtw_get_encrypt_decrypt_from_registrypriv23a(adapter);
|
|
-
|
|
if (pmlmepriv->assoc_ssid.ssid_len == 0) {
|
|
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
|
|
("@@@@@ joinbss event call back for Any SSid\n"));
|
|
@@ -2155,11 +2153,6 @@ void rtw_update_registrypriv_dev_network23a(struct rtw_adapter* adapter)
|
|
/* pdev_network->IELength = cpu_to_le32(sz); */
|
|
}
|
|
|
|
-void rtw_get_encrypt_decrypt_from_registrypriv23a(struct rtw_adapter* adapter)
|
|
-{
|
|
-
|
|
-}
|
|
-
|
|
/* the fucntion is at passive_level */
|
|
void rtw_joinbss_reset23a(struct rtw_adapter *padapter)
|
|
{
|
|
diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
|
|
index 79c3b3d..bc420ec 100644
|
|
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
|
|
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
|
|
@@ -331,8 +331,6 @@ void rtw_init_registrypriv_dev_network23a(struct rtw_adapter *adapter);
|
|
|
|
void rtw_update_registrypriv_dev_network23a(struct rtw_adapter *adapter);
|
|
|
|
-void rtw_get_encrypt_decrypt_from_registrypriv23a(struct rtw_adapter *adapter);
|
|
-
|
|
void rtw_scan_timeout_handler23a(unsigned long data);
|
|
|
|
void rtw_dynamic_check_timer_handler(unsigned long data);
|