TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: use ieee80211_p2p_noa_attr structure

Browse Source 
Use ieee80211_p2p_noa_attr structure during
P2P_PS (oppps) detection.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Janusz Dziedzic
2013-03-21 15:47:55 +01:00
committed by Johannes Berg
parent 19dde0bd71
commit 934457eeb0
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/mac80211/mlme.c
+15 -11
View File
@@ -1661,18 +1661,20 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
rcu_read_lock(); rcu_read_lock();
ies = rcu_dereference(cbss->ies); ies = rcu_dereference(cbss->ies);
if (ies) { if (ies) {
u8 noa[2]; struct ieee80211_p2p_noa_attr noa;
int ret; int ret;
ret = cfg80211_get_p2p_attr( ret = cfg80211_get_p2p_attr(
ies->data, ies->len, ies->data, ies->len,
IEEE80211_P2P_ATTR_ABSENCE_NOTICE, IEEE80211_P2P_ATTR_ABSENCE_NOTICE,
noa, sizeof(noa)); (u8 *) &noa, sizeof(noa));
if (ret >= 2) { if (ret >= 2) {
bss_conf->p2p_oppps = noa[1] & 0x80; bss_conf->p2p_oppps = noa.oppps_ctwindow &
bss_conf->p2p_ctwindow = noa[1] & 0x7f; IEEE80211_P2P_OPPPS_ENABLE_BIT;
bss_conf->p2p_ctwindow = noa.oppps_ctwindow &
IEEE80211_P2P_OPPPS_CTWINDOW_MASK;
bss_info_changed |= BSS_CHANGED_P2P_PS; bss_info_changed |= BSS_CHANGED_P2P_PS;
sdata->u.mgd.p2p_noa_index = noa[0]; sdata->u.mgd.p2p_noa_index = noa.index;
} }
} }
rcu_read_unlock(); rcu_read_unlock();
@@ -2961,18 +2963,20 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
} }
if (sdata->vif.p2p) { if (sdata->vif.p2p) {
u8 noa[2]; struct ieee80211_p2p_noa_attr noa;
int ret; int ret;
ret = cfg80211_get_p2p_attr(mgmt->u.beacon.variable, ret = cfg80211_get_p2p_attr(mgmt->u.beacon.variable,
len - baselen, len - baselen,
IEEE80211_P2P_ATTR_ABSENCE_NOTICE, IEEE80211_P2P_ATTR_ABSENCE_NOTICE,
noa, sizeof(noa)); (u8 *) &noa, sizeof(noa));
if (ret >= 2 && sdata->u.mgd.p2p_noa_index != noa[0]) { if (ret >= 2 && sdata->u.mgd.p2p_noa_index != noa.index) {
bss_conf->p2p_oppps = noa[1] & 0x80; bss_conf->p2p_oppps = noa.oppps_ctwindow &
bss_conf->p2p_ctwindow = noa[1] & 0x7f; IEEE80211_P2P_OPPPS_ENABLE_BIT;
bss_conf->p2p_ctwindow = noa.oppps_ctwindow &
IEEE80211_P2P_OPPPS_CTWINDOW_MASK;
changed |= BSS_CHANGED_P2P_PS; changed |= BSS_CHANGED_P2P_PS;
sdata->u.mgd.p2p_noa_index = noa[0]; sdata->u.mgd.p2p_noa_index = noa.index;
/* /*
* make sure we update all information, the CRC * make sure we update all information, the CRC
* mechanism doesn't look at P2P attributes. * mechanism doesn't look at P2P attributes.