| Message ID | CAFED-jmGRNFDHBvZQV=t7ETQa=yk4bZMjt1N8KckKweDLZE3uA@mail.gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
> - u8 p2p_ctwindow; > - bool p2p_oppps; > + struct ieee80211_p2p_noa_attr p2p_noa_attr; Shouldn't you also remove sdata.u.mgd.p2p_noa_index? Actually, maybe not, since that needs to be -1 in some cases, so n/m. > - if (params->p2p_opp_ps >= 0) { > - sdata->vif.bss_conf.p2p_oppps = params->p2p_opp_ps; > + if (params->p2p_opp_ps > 0) { > + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow |= BIT(8); > + changed |= BSS_CHANGED_P2P_PS; > + } else if (params->p2p_opp_ps == 0) { > + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow &= ~BIT(8); > changed |= BSS_CHANGED_P2P_PS; BIT(8) can't be right -- you mean 7? Maybe also time to introduce a constant for this so drivers can use it as well? > if (sdata->vif.p2p) { > - struct ieee80211_p2p_noa_attr noa; > int ret; > - > + struct ieee80211_p2p_noa_attr noa = {}; > + /* We have to handle here such cases: > + - p2p_attr disapear got catch, I guess I never noticed that -- also typo ("disappears" or "disappeared") wrong comment style though > + /* We can memcmp() here in case will find broken GO */ > + if (sdata->u.mgd.p2p_noa_index != noa.index) { > sdata->u.mgd.p2p_noa_index = noa.index; > + memcpy(&bss_conf->p2p_noa_attr, &noa, sizeof(noa)); > + changed |= BSS_CHANGED_P2P_PS; > /* > * make sure we update all information, the CRC > * mechanism doesn't look at P2P attributes. > */ > ifmgd->beacon_crc_valid = false; > } > + > + /* Or different handling: > + > + // Version 2: Are you asking me to pick version? I guess the first one above doesn't handle the disappearance case very well? > + int ret; > + struct ieee80211_p2p_noa_attr noa = {}; > + ret = cfg80211_get_p2p_attr(mgmt->u.beacon.variable, > + len - baselen, > + IEEE80211_P2P_ATTR_ABSENCE_NOTICE, > + (u8 *) &noa, 2); why 2 now? > + if (ret <= 0) { > + if (sdata->u.mgd.p2p_noa_index) { > + // NOA attr disapear > + sdata->u.mgd.p2p_noa_index = 0; > + memset(&bss_conf->p2p_noa_attr, 0, > + sizeof(bss_conf->p2p_noa_attr)); > + changed |= BSS_CHANGED_P2P_PS; > + ifmgd->beacon_crc_valid = false; > + } > + } else if (sdata->u.mgd.p2p_noa_index != noa.index) { > + // NOA changed, noa desc(s) could disapear > + memset(&bss_conf->p2p_noa_attr, 0, > + sizeof(bss_conf->p2p_noa_attr); > + ret = cfg80211_get_p2p_attr(mgmt->u.beacon.variable, > + len - baselen, > + IEEE80211_P2P_ATTR_ABSENCE_NOTICE, > + (u8 *) &bss_conf->p2p_noa_attr, > + sizeof(bss_conf->p2p_noa_attr)); I don't see why you'd want to retrieve it twice? It will only copy as much as is present and return the data length. > + // Version 3: > + int ret; > + memset(&bss_conf->p2p_noa_attr, 0, sizeof(bss_conf->p2p_noa_attr)); > + ret = cfg80211_get_p2p_attr(mgmt->u.beacon.variable, > + len - baselen, > + IEEE80211_P2P_ATTR_ABSENCE_NOTICE, > + (u8 *) &bss_conf->p2p_noa_attr, > + sizeof(bss_conf->p2p_noa_attr)); > + if (sdata->u.mgd.p2p_noa_index != noa.index) { > + sdata->u.mgd.p2p_noa_index = noa.index; > + changed |= BSS_CHANGED_P2P_PS; > + ifmgd->beacon_crc_valid = false; > + } Here you didn't check "ret", so the "disappeared entirely" case isn't handled? Seems like it should be like this: ret = get_p2p_attr(...) if (sdata->u.mgd.p2p_noa_index != noa.index || !ret) { if (ret) p2p_noa_index = noa.index else p2p_noa_index = -1; changed |= ... crc_valid = false; } to handle all the cases, including dis- and reappearance? johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index cdd7cea..582e743 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -363,8 +363,7 @@ struct ieee80211_bss_conf { size_t ssid_len; bool hidden_ssid; int txpower; - u8 p2p_ctwindow; - bool p2p_oppps; + struct ieee80211_p2p_noa_attr p2p_noa_attr; }; /** diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 1d1ddab..2a8be822 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -960,8 +960,12 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, sdata->vif.bss_conf.hidden_ssid = (params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE); - sdata->vif.bss_conf.p2p_ctwindow = params->p2p_ctwindow; - sdata->vif.bss_conf.p2p_oppps = params->p2p_opp_ps; + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow = + params->p2p_ctwindow & 0x7F; + if (params->p2p_opp_ps) + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow |= BIT(8); + else + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow &= ~BIT(8); err = ieee80211_assign_beacon(sdata, ¶ms->beacon); if (err < 0) @@ -1956,12 +1960,17 @@ static int ieee80211_change_bss(struct wiphy *wiphy, } if (params->p2p_ctwindow >= 0) { - sdata->vif.bss_conf.p2p_ctwindow = params->p2p_ctwindow; + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow &= ~0x7f; + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow |= + params->p2p_ctwindow & 0x7f; changed |= BSS_CHANGED_P2P_PS; } - if (params->p2p_opp_ps >= 0) { - sdata->vif.bss_conf.p2p_oppps = params->p2p_opp_ps; + if (params->p2p_opp_ps > 0) { + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow |= BIT(8); + changed |= BSS_CHANGED_P2P_PS; + } else if (params->p2p_opp_ps == 0) { + sdata->vif.bss_conf.p2p_noa_attr.oppps_ctwindow &= ~BIT(8); changed |= BSS_CHANGED_P2P_PS; } diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 4fecfb8..2681429 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1655,18 +1655,17 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, rcu_read_lock(); ies = rcu_dereference(cbss->ies); if (ies) { - struct ieee80211_p2p_noa_attr noa; int ret; ret = cfg80211_get_p2p_attr( ies->data, ies->len, IEEE80211_P2P_ATTR_ABSENCE_NOTICE, - (u8 *) &noa, sizeof(noa)); + (u8 *) &bss_conf->p2p_noa_attr, + sizeof(bss_conf->p2p_noa_attr)); if (ret >= 2) { - bss_conf->p2p_oppps = noa.oppps_ctwindow & 0x80; - bss_conf->p2p_ctwindow = noa.oppps_ctwindow & 0x7f; + sdata->u.mgd.p2p_noa_index = + bss_conf->p2p_noa_attr.index; bss_info_changed |= BSS_CHANGED_P2P_PS; - sdata->u.mgd.p2p_noa_index = noa.index; } }