On Wed, Nov 2, 2011 at 10:35 AM, Thomas Pedersen <thomas@xxxxxxxxxxx> wrote: > On Wed, Nov 2, 2011 at 3:17 AM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote: >> On Fri, 2011-10-28 at 22:05 -0700, Thomas Pedersen wrote: >>> Previously QoS multicast frames had the Normal Acknowledgment QoS >>> control bits set. This would cause broadcast frames to be discarded by >>> peers with which we have a BA session, since their sequence number would >>> fall outside the allowed range. Set No Ack QoS control bits on multicast >>> QoS frames and filter these in de-aggregation code. >> >> I'm not sure why you would attempt to deaggregate broadcast frames but I >> guess mesh is a bit special. >> I don't think it's a mesh specific thing, broadcast frames are just not being sent out as QoS data in the infrastructure case and therefore not caught by the de-aggregation code. According to 7.2.2, broadcast and multicast data frames should go out as QoS if all STAs in the BSS are QoS STAs. I don't know if this really matters in practice though. >>> @@ -770,6 +771,11 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx) >>> if (unlikely(hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_NULLFUNC))) >>> goto dont_reorder; >>> >>> + /* not part of a BA session */ >>> + if (!((ack_policy == IEEE80211_QOS_CTL_ACK_POLICY_BLOCKACK) || >>> + (ack_policy == IEEE80211_QOS_CTL_ACK_POLICY_NORMAL))) >>> + goto dont_reorder; >> >> Maybe ack_policy != BA && ack_policy != NORMAl would be easier to read? > > OK. >> >>> --- a/net/mac80211/wme.c >>> +++ b/net/mac80211/wme.c >>> @@ -147,7 +147,8 @@ void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata, >>> >>> tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; >>> >>> - if (unlikely(sdata->local->wifi_wme_noack_test)) >>> + if (unlikely(sdata->local->wifi_wme_noack_test) || >>> + is_multicast_ether_addr(hdr->addr1)) >>> ack_policy |= IEEE80211_QOS_CTL_ACK_POLICY_NOACK; >> >> Interestingly, this seems to have been a bug for a long time -- >> 7.1.3.5.3 indicates this is supposed to be done. > > I'll fix up the other patches as well and resubmit. > > Thanks! > Thomas > -- 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
