Linux wireless drivers development
 help / color / mirror / Atom feed
From: Harvey Harrison <harvey.harrison@gmail.com>
To: Tomas Winkler <tomas.winkler@intel.com>
Cc: linville@tuxdriver.com, johannes@sipsolutions.net,
	yi.zhu@intel.com, linux-wireless@vger.kernel.org,
	Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: Re: [PATCH 1/1 V2] mac80211: Fix ieee80211_rx_reorder_ampdu: ignore QoS null packets
Date: Mon, 07 Jul 2008 09:23:44 -0700	[thread overview]
Message-ID: <1215447824.14247.2.camel@brick> (raw)
In-Reply-To: <1215434881-5410-1-git-send-email-tomas.winkler@intel.com>

On Mon, 2008-07-07 at 15:48 +0300, Tomas Winkler wrote:
> From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> 
> 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?

Cheers,

Harvey



  reply	other threads:[~2008-07-07 16:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-07 12:48 [PATCH 1/1 V2] mac80211: Fix ieee80211_rx_reorder_ampdu: ignore QoS null packets Tomas Winkler
2008-07-07 16:23 ` Harvey Harrison [this message]
2008-07-07 17:02   ` Michael Buesch
2008-07-07 19:26     ` Harvey Harrison
2008-07-07 21:23       ` Tomas Winkler
2008-07-07 21:43         ` Harvey Harrison
2008-07-07 22:16           ` Tomas Winkler
2008-07-07 22:44             ` Harvey Harrison
2008-07-07 23:01               ` Tomas Winkler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1215447824.14247.2.camel@brick \
    --to=harvey.harrison@gmail.com \
    --cc=emmanuel.grumbach@intel.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=tomas.winkler@intel.com \
    --cc=yi.zhu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox