staging: rtl8723au: rtw_get_wps_attr_content23a(): Remove unused argument

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_ieee80211.c b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
index 2cb8eed..1f28cca 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8723au/core/rtw_ieee80211.c
@@ -667,15 +667,11 @@ const u8 *rtw_get_wps_attr23a(const u8 *wps_ie, uint wps_ielen,
  * Returns: the address of the specific WPS attribute content found, or NULL
  */
 const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen,
-                                     u16 target_attr_id, u8 *buf_content,
-                                     uint *len_content)
+                                     u16 target_attr_id, u8 *buf_content)
 {
        const u8 *attr_ptr;
        u32 attr_len;
 
-       if (len_content)
-               *len_content = 0;
-
        attr_ptr = rtw_get_wps_attr23a(wps_ie, wps_ielen, target_attr_id,
                                    NULL, &attr_len);
 
@@ -683,9 +679,6 @@ const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen,
                if (buf_content)
                        memcpy(buf_content, attr_ptr + 4, attr_len - 4);
 
-               if (len_content)
-                       *len_content = attr_len - 4;
-
                return attr_ptr + 4;
        }
 

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
index 3a86b75..4b769d5 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c
@@ -2437,7 +2437,7 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms)
                if (wps_ie && wps_ie[1] > 0) {
                        rtw_get_wps_attr_content23a(wps_ie, wps_ie[1],
                                                    WPS_ATTR_SELECTED_REGISTRAR,
-                                                   (u8*)&sr, NULL);
+                                                   (u8*)&sr);
                }
                if (sr != 0)
                        set_fwstate(pmlmepriv, WIFI_UNDER_WPS);

diff --git a/drivers/staging/rtl8723au/include/ieee80211.h b/drivers/staging/rtl8723au/include/ieee80211.h
index 43f002d..89c23ae 100644 (file)
--- a/drivers/staging/rtl8723au/include/ieee80211.h
+++ b/drivers/staging/rtl8723au/include/ieee80211.h
@@ -389,7 +389,7 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int
 int rtw_parse_wpa2_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwise_cipher, int *is_8021x);
 
 const u8 *rtw_get_wps_attr23a(const u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_attr, u32 *len_attr);
-const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_content, uint *len_content);
+const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_content);
 
 uint   rtw_get_rateset_len23a(u8       *rateset);