Commit c250e07e authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: rtw_get_wps_attr_content23a(): Remove unused argument

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ef2a15a
...@@ -667,15 +667,11 @@ const u8 *rtw_get_wps_attr23a(const u8 *wps_ie, uint wps_ielen, ...@@ -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 * 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, const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen,
u16 target_attr_id, u8 *buf_content, u16 target_attr_id, u8 *buf_content)
uint *len_content)
{ {
const u8 *attr_ptr; const u8 *attr_ptr;
u32 attr_len; u32 attr_len;
if (len_content)
*len_content = 0;
attr_ptr = rtw_get_wps_attr23a(wps_ie, wps_ielen, target_attr_id, attr_ptr = rtw_get_wps_attr23a(wps_ie, wps_ielen, target_attr_id,
NULL, &attr_len); NULL, &attr_len);
...@@ -683,9 +679,6 @@ const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen, ...@@ -683,9 +679,6 @@ const u8 *rtw_get_wps_attr_content23a(const u8 *wps_ie, uint wps_ielen,
if (buf_content) if (buf_content)
memcpy(buf_content, attr_ptr + 4, attr_len - 4); memcpy(buf_content, attr_ptr + 4, attr_len - 4);
if (len_content)
*len_content = attr_len - 4;
return attr_ptr + 4; return attr_ptr + 4;
} }
......
...@@ -2437,7 +2437,7 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms) ...@@ -2437,7 +2437,7 @@ void issue_beacon23a(struct rtw_adapter *padapter, int timeout_ms)
if (wps_ie && wps_ie[1] > 0) { if (wps_ie && wps_ie[1] > 0) {
rtw_get_wps_attr_content23a(wps_ie, wps_ie[1], rtw_get_wps_attr_content23a(wps_ie, wps_ie[1],
WPS_ATTR_SELECTED_REGISTRAR, WPS_ATTR_SELECTED_REGISTRAR,
(u8*)&sr, NULL); (u8*)&sr);
} }
if (sr != 0) if (sr != 0)
set_fwstate(pmlmepriv, WIFI_UNDER_WPS); set_fwstate(pmlmepriv, WIFI_UNDER_WPS);
......
...@@ -389,7 +389,7 @@ int rtw_parse_wpa_ie23a(const u8* wpa_ie, int wpa_ie_len, int *group_cipher, int ...@@ -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); 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_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); uint rtw_get_rateset_len23a(u8 *rateset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment