On Monday 07 July 2008 18:23:44 Harvey Harrison wrote: > On Mon, 2008-07-07 at 15:48 +0300, Tomas Winkler wrote: > > From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > > > > This patch fixes the check at the entrance to ieee80211_rx_reorder_ampdu. > > This check has been broken by 511fe3f3c4ba0b5b77421336f64a19b6cd00e65f > > 'mac80211: rx.c use new helpers' > > > Actually, do we want something like this instead: > > > diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c > > index 6a88e8f..a6e8214 100644 > > --- a/net/mac80211/rx.c > > +++ b/net/mac80211/rx.c > > @@ -2052,7 +2052,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, > > tid_agg_rx = sta->ampdu_mlme.tid_rx[tid]; > > > > /* null data frames are excluded */ > > - if (unlikely(ieee80211_is_nullfunc(hdr->frame_control))) > > + if (unlikely(ieee80211_is_qos_nullfunc(hdr->frame_control))) > > goto end_reorder; > > > > /* new un-ordered ampdu frame - process it */ > > if (unlikely(ieee80211_is_data(hdr->frame_control) && (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_NULLFUNC)))) > > Or wrap the above in a ieee80211_is_data_has_nullfunc() helper? I think this helper naming is becoming a bit weird and obfuscating. I'd say just opencode it, if it's only used in a few places. -- Greetings Michael. -- 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
