| Message ID | 1467335974-2802-1-git-send-email-masashi.honma@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
On Fri, 2016-07-01 at 10:19 +0900, Masashi Honma wrote: > Previously, mesh power management functionality works only with > kernel > MPM. Because user space MPM did not report mesh peer AID to kernel, > the kernel could not identify the bit in TIM element. So this patch > adds mesh peer AID setting API. > > Signed-off-by: Masashi Honma <masashi.honma@gmail.com> > --- > include/net/cfg80211.h | 2 ++ > include/uapi/linux/nl80211.h | 5 +++++ > net/mac80211/cfg.c | 1 + > net/wireless/nl80211.c | 7 +++++++ > 4 files changed, 15 insertions(+) > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index 7bbb00d..23e34ca 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -774,6 +774,7 @@ enum station_parameters_apply_mask { > * (bitmask of BIT(NL80211_STA_FLAG_...)) > * @listen_interval: listen interval or -1 for no change > * @aid: AID or zero for no change > + * @peer_aid: mesh peer AID or zero for no change > * @plink_action: plink action to take > * @plink_state: set the peer link state for a station > * @ht_capa: HT capabilities of station > @@ -805,6 +806,7 @@ struct station_parameters { > u32 sta_modify_mask; > int listen_interval; > u16 aid; > + u16 peer_aid; > u8 supported_rates_len; > u8 plink_action; > u8 plink_state; > diff --git a/include/uapi/linux/nl80211.h > b/include/uapi/linux/nl80211.h > index 53c8278..f8c454e 100644 > --- a/include/uapi/linux/nl80211.h > +++ b/include/uapi/linux/nl80211.h > @@ -1829,6 +1829,9 @@ enum nl80211_commands { > * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended > capabilities per > * interface type. > * > + * @NL80211_ATTR_MESH_PEER_AID: Association ID for the mesh peer > (u16). This is > + * used to pull the stored data for mesh peer in power save > state. > Why does this need new API all over? It seems to me that it could just use the regular NL80211_ATTR_STA_AID attribute, and the cfg80211 code would already be in place, and you'd just need to add a single line to mac80211 and to cfg80211_check_station_change() to accept that. 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
On Wed, Jul 06, 2016 at 02:42:34PM +0200, Johannes Berg wrote: > > + * @NL80211_ATTR_MESH_PEER_AID: Association ID for the mesh peer > > (u16). This is > > + * used to pull the stored data for mesh peer in power save > > state. > > > Why does this need new API all over? > > It seems to me that it could just use the regular NL80211_ATTR_STA_AID > attribute, and the cfg80211 code would already be in place, and you'd > just need to add a single line to mac80211 and > to cfg80211_check_station_change() to accept that. We are already using NL80211_ATTR_STA_AID, though -- one is for the station's AID (in our TIM, which is NL80211_ATTR_STA_AID) and the new one is for our AID in the peer's TIM. There is the NL80211_ATTR_PEER_AID but that seems specific to TDLS and also doesn't appear to be processed in the necessary way (e.g. overrides STA_AID in nl80211_new_station).
> > It seems to me that it could just use the > > regular NL80211_ATTR_STA_AID > > attribute, and the cfg80211 code would already be in place, and > > you'd > > just need to add a single line to mac80211 and > > to cfg80211_check_station_change() to accept that. > > We are already using NL80211_ATTR_STA_AID, though -- one is for the > station's AID (in our TIM, which is NL80211_ATTR_STA_AID) and the new > one > is for our AID in the peer's TIM. > > There is the NL80211_ATTR_PEER_AID but that seems specific to TDLS > and > also doesn't appear to be processed in the necessary way (e.g. > overrides > STA_AID in nl80211_new_station). Oh, ok. Applied then. 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/cfg80211.h b/include/net/cfg80211.h index 7bbb00d..23e34ca 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -774,6 +774,7 @@ enum station_parameters_apply_mask { * (bitmask of BIT(NL80211_STA_FLAG_...)) * @listen_interval: listen interval or -1 for no change * @aid: AID or zero for no change + * @peer_aid: mesh peer AID or zero for no change * @plink_action: plink action to take * @plink_state: set the peer link state for a station * @ht_capa: HT capabilities of station @@ -805,6 +806,7 @@ struct station_parameters { u32 sta_modify_mask; int listen_interval; u16 aid; + u16 peer_aid; u8 supported_rates_len; u8 plink_action; u8 plink_state; diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 53c8278..f8c454e 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -1829,6 +1829,9 @@ enum nl80211_commands { * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per * interface type. * + * @NL80211_ATTR_MESH_PEER_AID: Association ID for the mesh peer (u16). This is + * used to pull the stored data for mesh peer in power save state. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use @@ -2213,6 +2216,8 @@ enum nl80211_attrs { NL80211_ATTR_IFTYPE_EXT_CAPA, + NL80211_ATTR_MESH_PEER_AID, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 0c12e40..47e99ab8 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -997,6 +997,7 @@ static void sta_apply_mesh_params(struct ieee80211_local *local, if (sta->mesh->plink_state != NL80211_PLINK_ESTAB) changed = mesh_plink_inc_estab_count(sdata); sta->mesh->plink_state = params->plink_state; + sta->mesh->aid = params->peer_aid; ieee80211_mps_sta_status_update(sta); changed |= ieee80211_mps_set_sta_local_pm(sta, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 244d552..8337349 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4410,6 +4410,13 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) nla_get_u8(info->attrs[NL80211_ATTR_STA_PLINK_STATE]); if (params.plink_state >= NUM_NL80211_PLINK_STATES) return -EINVAL; + if (info->attrs[NL80211_ATTR_MESH_PEER_AID]) { + if (nla_get_u16(info->attrs[NL80211_ATTR_MESH_PEER_AID]) + > IEEE80211_MAX_AID) + return -EINVAL; + params.peer_aid = nla_get_u16( + info->attrs[NL80211_ATTR_MESH_PEER_AID]); + } params.sta_modify_mask |= STATION_PARAM_APPLY_PLINK_STATE; }
Previously, mesh power management functionality works only with kernel MPM. Because user space MPM did not report mesh peer AID to kernel, the kernel could not identify the bit in TIM element. So this patch adds mesh peer AID setting API. Signed-off-by: Masashi Honma <masashi.honma@gmail.com> --- include/net/cfg80211.h | 2 ++ include/uapi/linux/nl80211.h | 5 +++++ net/mac80211/cfg.c | 1 + net/wireless/nl80211.c | 7 +++++++ 4 files changed, 15 insertions(+)