On Fri, 2012-11-23 at 12:18 -0800, Marco Porsch wrote:
> For performance reasons, calls to the function setting the frame flags are
> placed in HWMP routing routines, as there the STA pointer is already availible.
typo: available
> + /*
> + * Nulls are only sent to direct peers for PS and
> + * should already be addressed
> + */
> + if (ieee80211_is_qos_nullfunc(hdr->frame_control))
> + return err;
return 0 would be easier ...
> + * NOTE: sta must be given when an individually-addressed QoS frame header
> + * is handed, for group-addressed and management frames it not used
typo: handled
> + if (WARN_ON(is_unicast_ether_addr(hdr->addr1) &&
> + ieee80211_is_data_qos(hdr->frame_control) &&
> + !sta))
> + return;
last time I'm commenting on whitespace/indentation issues
> + ieee80211_set_mesh_ps_flags(sdata, NULL,
> + (struct ieee80211_hdr *) mgmt);
if you just do (void *)mgmt it'll fit on one line
> --- a/net/mac80211/wme.c
> +++ b/net/mac80211/wme.c
> @@ -191,6 +191,15 @@ void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata,
>
> /* qos header is 2 bytes */
> *p++ = ack_policy | tid;
> - *p = ieee80211_vif_is_mesh(&sdata->vif) ?
> - (IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT >> 8) : 0;
> + if (ieee80211_vif_is_mesh(&sdata->vif)) {
> + /* preserve RSPI and Mesh PS Level bit */
> + *p &= ((IEEE80211_QOS_CTL_RSPI |
> + IEEE80211_QOS_CTL_MESH_PS_LEVEL) >> 8);
> +
> + /* Nulls don't have a mesh header (frame body) */
> + if (!ieee80211_is_qos_nullfunc(hdr->frame_control))
> + *p |= (IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT >> 8);
> + } else {
> + *p = 0;
> + }
> }
This looks so much better now :)
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
