staging: rtl8723au: Remove unused struct mlme_priv->wps_probe_resp_ie

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 76e23575b7e5f6665160ec4b02974013a458d082..753a0fe8b96bd38ec72544dbf591aa8ab88fe705 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ap.c
+++ b/drivers/staging/rtl8723au/core/rtw_ap.c
@@ -1915,8 +1915,6 @@ void start_ap_mode23a(struct rtw_adapter *padapter)
        for (i = 0; i<NUM_STA; i++)
                pstapriv->sta_aid[i] = NULL;
 
-       pmlmepriv->wps_probe_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 c873cb3741f5d954608a9f8f909a1c69c2e63b2d..0653f953cc6a81745e9442b86b545c303bd74f60 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -89,8 +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->wps_probe_resp_ie,
-                             &pmlmepriv->wps_probe_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 d995bec97675bbd5dd10e8c0e0a2a327792cbc59..d1c40ae465413ef4ed09822c90a8c0296d3e07f5 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -2524,13 +2524,11 @@ static void issue_probersp(struct rtw_adapter *padapter, unsigned char *da,
        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 #ifdef CONFIG_8723AU_AP_MODE
        const u8 *pwps_ie;
-       uint wps_ielen;
        u8 *ssid_ie;
        int ssid_ielen;
        int ssid_ielen_diff;
        u8 buf[MAX_IE_SZ];
        u8 *ies;
-       struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 #endif
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -2594,43 +2592,9 @@ static void issue_probersp(struct rtw_adapter *padapter, unsigned char *da,
                                                  cur_network->IELength -
                                                  _FIXED_IE_LENGTH_);
 
-               /* inerset & update wps_probe_resp_ie */
-               if (pmlmepriv->wps_probe_resp_ie && pwps_ie && pwps_ie[1] > 0) {
-                       uint wps_offset, remainder_ielen;
-                       const u8 *premainder_ie;
-
-                       wps_ielen = pwps_ie[1];
-                       wps_offset = (uint)(pwps_ie - cur_network->IEs);
-
-                       premainder_ie = pwps_ie + wps_ielen;
-
-                       remainder_ielen = cur_network->IELength - wps_offset -
-                               wps_ielen;
-
-                       memcpy(pframe, cur_network->IEs, wps_offset);
-                       pframe += wps_offset;
-                       pattrib->pktlen += wps_offset;
-
-                       /* to get ie data len */
-                       wps_ielen = (uint)pmlmepriv->wps_probe_resp_ie[1];
-                       if (wps_offset + wps_ielen + 2 <= MAX_IE_SZ) {
-                               memcpy(pframe, pmlmepriv->wps_probe_resp_ie,
-                                      wps_ielen+2);
-                               pframe += wps_ielen+2;
-                               pattrib->pktlen += wps_ielen+2;
-                       }
-
-                       if (wps_offset + wps_ielen + 2 + remainder_ielen <=
-                           MAX_IE_SZ) {
-                               memcpy(pframe, premainder_ie, remainder_ielen);
-                               pframe += remainder_ielen;
-                               pattrib->pktlen += remainder_ielen;
-                       }
-               } else {
-                       memcpy(pframe, cur_network->IEs, cur_network->IELength);
-                       pframe += cur_network->IELength;
-                       pattrib->pktlen += cur_network->IELength;
-               }
+               memcpy(pframe, cur_network->IEs, cur_network->IELength);
+               pframe += cur_network->IELength;
+               pattrib->pktlen += cur_network->IELength;
 
                /* retrieve SSID IE from cur_network->Ssid */
                ies = pmgntframe->buf_addr + TXDESC_OFFSET +

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