staging: rtl8723au: Remove unused mlme_priv->wps_assoc_resp_ie and friends

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 8ba346f54bbb8a59f33cd370c3333d38ca72114d..76e23575b7e5f6665160ec4b02974013a458d082 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -1916,7 +1916,6 @@ void start_ap_mode23a(struct rtw_adapter *padapter)
                pstapriv->sta_aid[i] = NULL;
 
        pmlmepriv->wps_probe_resp_ie = NULL;
-       pmlmepriv->wps_assoc_resp_ie = NULL;
 
        pmlmepriv->p2p_beacon_ie = NULL;
        pmlmepriv->p2p_probe_resp_ie = NULL;

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index eefe40a7a5647dbc0580dc71e541641e4a40a40b..c873cb3741f5d954608a9f8f909a1c69c2e63b2d 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -91,8 +91,6 @@ void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv)
                              &pmlmepriv->wps_probe_req_ie_len);
        rtw_free_mlme_ie_data(&pmlmepriv->wps_probe_resp_ie,
                              &pmlmepriv->wps_probe_resp_ie_len);
-       rtw_free_mlme_ie_data(&pmlmepriv->wps_assoc_resp_ie,
-                             &pmlmepriv->wps_assoc_resp_ie_len);
 
        rtw_free_mlme_ie_data(&pmlmepriv->p2p_beacon_ie,
                              &pmlmepriv->p2p_beacon_ie_len);

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index 8590faa483fa2562e4ef6afeb0ff5188b509d8d2..d995bec97675bbd5dd10e8c0e0a2a327792cbc59 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -3137,16 +3137,6 @@ static void issue_assocrsp(struct rtw_adapter *padapter, unsigned short status,
                                       REALTEK_96B_IE, &pattrib->pktlen);
        }
 
-       /* add WPS IE ie for wps 2.0 */
-       if (pmlmepriv->wps_assoc_resp_ie &&
-           pmlmepriv->wps_assoc_resp_ie_len > 0) {
-               memcpy(pframe, pmlmepriv->wps_assoc_resp_ie,
-                      pmlmepriv->wps_assoc_resp_ie_len);
-
-               pframe += pmlmepriv->wps_assoc_resp_ie_len;
-               pattrib->pktlen += pmlmepriv->wps_assoc_resp_ie_len;
-       }
-
        pattrib->last_txcmdsz = pattrib->pktlen;
 
        dump_mgntframe23a(padapter, pmgntframe);

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index 6dccfb045ffe3e588c728962ff527c09680a3a3f..c45a9f0da47ef194a24ce23a04b6bb114a533a93 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;
-       u32 wps_assoc_resp_ie_len;
-       u8 *wps_assoc_resp_ie;
        u8 *wps_probe_resp_ie;
        u32 wps_probe_resp_ie_len;
        u32 p2p_go_probe_resp_ie_len; /* for GO */