mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 04:29:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: OnProbeReq23a() Use cfg80211_find_ie()

Browse Source 
Switch to using cfg80211_find_ie() and tidy of the code.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen
2014-04-15 19:43:39 +02:00
committed by Greg Kroah-Hartman
parent 2403ea62b5
commit 9f0e58664b
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/staging/rtl8723au/core/rtw_mlme_ext.c
View File

@@ -640,8 +640,7 @@ Following are the callback functions for each subtype of the management frames
unsigned int OnProbeReq23a(struct rtw_adapter *padapter,
struct recv_frame *precv_frame)
{
unsigned int ielen;
unsigned char *p;
const u8 *ie;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -652,44 +651,38 @@ unsigned int OnProbeReq23a(struct rtw_adapter *padapter,
uint len = skb->len;
u8 is_valid_p2p_probereq = false;
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
return _SUCCESS;
}
if (check_fwstate(pmlmepriv, _FW_LINKED) == false &&
check_fwstate(pmlmepriv,
WIFI_ADHOC_MASTER_STATE|WIFI_AP_STATE) == false) {
if (!check_fwstate(pmlmepriv, _FW_LINKED) &&
!check_fwstate(pmlmepriv,
WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE))
return _SUCCESS;
}
p = rtw_get_ie23a(pframe + sizeof(struct ieee80211_hdr_3addr) +
_PROBEREQ_IE_OFFSET_, WLAN_EID_SSID, (int *)&ielen,
len - sizeof(struct ieee80211_hdr_3addr) -
_PROBEREQ_IE_OFFSET_);
pframe += (sizeof(struct ieee80211_hdr_3addr) + _PROBEREQ_IE_OFFSET_);
len -= (sizeof(struct ieee80211_hdr_3addr) + _PROBEREQ_IE_OFFSET_);
ie = cfg80211_find_ie(WLAN_EID_SSID, pframe, len);
/* check (wildcard) SSID */
if (p) {
if (is_valid_p2p_probereq == true) {
goto _issue_probersp23a;
}
if (!ie)
goto out;
if ((ielen != 0 &&
memcmp((void *)(p+2), cur->Ssid.ssid,
cur->Ssid.ssid_len)) ||
(ielen == 0 && pmlmeinfo->hidden_ssid_mode)) {
if (is_valid_p2p_probereq == false) {
if ((ie[1] &&
memcmp(ie + 2, cur->Ssid.ssid, cur->Ssid.ssid_len)) ||
(ie[1] == 0 && pmlmeinfo->hidden_ssid_mode)) {
return _SUCCESS;
}
_issue_probersp23a:
if (check_fwstate(pmlmepriv, _FW_LINKED) == true &&
pmlmepriv->cur_network.join_res == true) {
/* DBG_8723A("+issue_probersp23a during ap mode\n"); */
issue_probersp23a(padapter, ieee80211_get_SA(hdr),
is_valid_p2p_probereq);
}
}
if (check_fwstate(pmlmepriv, _FW_LINKED) &&
pmlmepriv->cur_network.join_res) {
issue_probersp23a(padapter, ieee80211_get_SA(hdr),
is_valid_p2p_probereq);
}
out:
return _SUCCESS;
}