72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Date: Sat, 21 Jun 2014 16:50:12 +0200
|
|
Subject: [116/249] staging: rtl8723au: Remove obsolete mlme_priv->p2p_*
|
|
entries
|
|
Origin: https://git.kernel.org/linus/a8607ffcf2783662eb757477d3a7493d0f087ed2
|
|
|
|
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/rtl8723au/core/rtw_ap.c | 3 ---
|
|
drivers/staging/rtl8723au/core/rtw_mlme.c | 11 -----------
|
|
drivers/staging/rtl8723au/include/rtw_mlme.h | 10 ----------
|
|
3 files changed, 24 deletions(-)
|
|
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
|
|
index 753a0fe..7f1c687 100644
|
|
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
|
|
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
|
|
@@ -1915,9 +1915,6 @@ void start_ap_mode23a(struct rtw_adapter *padapter)
|
|
for (i = 0; i<NUM_STA; i++)
|
|
pstapriv->sta_aid[i] = NULL;
|
|
|
|
- pmlmepriv->p2p_beacon_ie = NULL;
|
|
- pmlmepriv->p2p_probe_resp_ie = NULL;
|
|
-
|
|
/* for ACL */
|
|
INIT_LIST_HEAD(&pacl_list->acl_node_q.queue);
|
|
pacl_list->num = 0;
|
|
diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
index 0653f95..f9ead3e 100644
|
|
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
|
|
@@ -90,17 +90,6 @@ void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
|
|
rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie,
|
|
&pmlmepriv->wps_probe_req_ie_len);
|
|
|
|
- rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie,
|
|
- &pmlmepriv->p2p_beacon_ie_len);
|
|
- rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_req_ie,
|
|
- &pmlmepriv->p2p_probe_req_ie_len);
|
|
- rtw_free_mlme_ie_data(&pmlmepriv->p2p_probe_resp_ie,
|
|
- &pmlmepriv->p2p_probe_resp_ie_len);
|
|
- rtw_free_mlme_ie_data(&pmlmepriv->p2p_go_probe_resp_ie,
|
|
- &pmlmepriv->p2p_go_probe_resp_ie_len);
|
|
- rtw_free_mlme_ie_data(&pmlmepriv->p2p_assoc_req_ie,
|
|
- &pmlmepriv->p2p_assoc_req_ie_len);
|
|
-
|
|
rtw_free_mlme_ie_data(&pmlmepriv->wfd_beacon_ie,
|
|
&pmlmepriv->wfd_beacon_ie_len);
|
|
rtw_free_mlme_ie_data(&pmlmepriv->wfd_probe_req_ie,
|
|
diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
|
|
index ef70e4a..be60998 100644
|
|
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
|
|
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
|
|
@@ -163,16 +163,6 @@ struct mlme_priv {
|
|
u32 assoc_req_len;
|
|
u32 assoc_rsp_len;
|
|
u8 *assoc_rsp;
|
|
- u32 p2p_go_probe_resp_ie_len; /* for GO */
|
|
- u32 p2p_assoc_req_ie_len;
|
|
- u8 *p2p_beacon_ie;
|
|
- u8 *p2p_probe_req_ie;
|
|
- u8 *p2p_probe_resp_ie;
|
|
- u8 *p2p_go_probe_resp_ie; /* for GO */
|
|
- u8 *p2p_assoc_req_ie;
|
|
- u32 p2p_beacon_ie_len;
|
|
- u32 p2p_probe_req_ie_len;
|
|
- u32 p2p_probe_resp_ie_len;
|
|
u8 *wfd_assoc_req_ie;
|
|
u32 wfd_assoc_req_ie_len;
|
|
|