On Mon, 2008-06-09 at 12:28 -0700, Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
> ---
> net/mac80211/wme.c | 18 +++++-------------
> 1 files changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
> index 14a9ff1..d8c2f96 100644
> --- a/net/mac80211/wme.c
> +++ b/net/mac80211/wme.c
> @@ -105,11 +105,8 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
> {
> struct ieee80211_local *local = wdev_priv(qd->dev->ieee80211_ptr);
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
> - unsigned short fc = le16_to_cpu(hdr->frame_control);
> - int qos;
>
> - /* see if frame is data or non data frame */
> - if (unlikely((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)) {
> + if (!ieee80211_is_data(hdr->frame_control)) {
Sorry, I didn't refresh this patch to preserve the unlikely().
Let me know if you want a replacement.
Harvey
--
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
