staging: rtl8723au: Remove unused struct mlme_priv->wfd_* entries

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_ap.c b/drivers/staging/rtl8723au/core/rtw_ap.c
index 7f1c687786187826e5fe2fea7e2579faf9702af2..18c9b307b4b4ab082d299bf952e08a37587987f8 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -24,7 +24,6 @@
 extern unsigned char WMM_OUI23A[];
 extern unsigned char WPS_OUI23A[];
 extern unsigned char P2P_OUI23A[];
-extern unsigned char WFD_OUI23A[];
 
 void init_mlme_ap_info23a(struct rtw_adapter *padapter)
 {

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index f9ead3ec34f7b488cf0a944fd47c8414de30af5f..77714fe259a238d87c1fd433506ee353163fc3f1 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -89,17 +89,6 @@ void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
        kfree(pmlmepriv->assoc_rsp);
        rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_req_ie,
                              &pmlmepriv->wps_probe_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,
-                             &pmlmepriv->wfd_probe_req_ie_len);
-       rtw_free_mlme_ie_data(&pmlmepriv->wfd_probe_resp_ie,
-                             &pmlmepriv->wfd_probe_resp_ie_len);
-       rtw_free_mlme_ie_data(&pmlmepriv->wfd_go_probe_resp_ie,
-                             &pmlmepriv->wfd_go_probe_resp_ie_len);
-       rtw_free_mlme_ie_data(&pmlmepriv->wfd_assoc_req_ie,
-                             &pmlmepriv->wfd_assoc_req_ie_len);
 #endif
 }
 

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index be6099818c9b6dfa046a68f6e975dc5e1f9f16f5..277d90b7660886aa360c5537d92acab03e3c1b42 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -163,8 +163,6 @@ struct mlme_priv {
        u32 assoc_req_len;
        u32 assoc_rsp_len;
        u8 *assoc_rsp;
-       u8 *wfd_assoc_req_ie;
-       u32 wfd_assoc_req_ie_len;
 
 #ifdef CONFIG_8723AU_AP_MODE
        /* Number of associated Non-ERP stations (i.e., stations using 802.11b
@@ -197,16 +195,6 @@ struct mlme_priv {
        u8              update_bcn;
 
 #endif /* ifdef CONFIG_8723AU_AP_MODE */
-
-       u8 *wfd_beacon_ie;
-       u8 *wfd_probe_req_ie;
-       u8 *wfd_probe_resp_ie;
-       u8 *wfd_go_probe_resp_ie; /* for GO */
-
-       u32 wfd_beacon_ie_len;
-       u32 wfd_probe_req_ie_len;
-       u32 wfd_probe_resp_ie_len;
-       u32 wfd_go_probe_resp_ie_len; /* for GO */
 };
 
 void rtw_joinbss_event_prehandle23a(struct rtw_adapter *adapter, u8 *pbuf);