Return-path: Received: from qw-out-2122.google.com ([74.125.92.27]:25971 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752310AbZFIARH convert rfc822-to-8bit (ORCPT ); Mon, 8 Jun 2009 20:17:07 -0400 Received: by qw-out-2122.google.com with SMTP id 5so2266419qwd.37 for ; Mon, 08 Jun 2009 17:17:09 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <43e72e890906081215u54f76ae6uded65345829ea843@mail.gmail.com> References: <1244246629-28179-1-git-send-email-lrodriguez@atheros.com> <1244246629-28179-14-git-send-email-lrodriguez@atheros.com> <69e28c910906081130q3f8363c2i64e05d61812e7be3@mail.gmail.com> <43e72e890906081215u54f76ae6uded65345829ea843@mail.gmail.com> From: "Luis R. Rodriguez" Date: Mon, 8 Jun 2009 17:16:49 -0700 Message-ID: <43e72e890906081716n12083f22j9d69e631b540a15d@mail.gmail.com> Subject: Re: [PATCH v2 13/15] iwlwifi: use ieee80211_is_data(fc) To: =?UTF-8?Q?G=C3=A1bor_Stefanik?= Cc: linville@tuxdriver.com, johannes@sipsolutions.net, j@w1.fi, linux-wireless@vger.kernel.org, ath9k-devel@lists.ath9k.org, Zhu Yi , Reinette Chatre , ipw3945-devel@lists.sourceforge.net Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: 2009/6/8 Luis R. Rodriguez : > 2009/6/8 Gábor Stefanik : >> On Sat, Jun 6, 2009 at 2:03 AM, Luis R. Rodriguez wrote: >>> Cc: Zhu Yi >>> Cc: Reinette Chatre >>> Cc: ipw3945-devel@lists.sourceforge.net >>> Signed-off-by: Luis R. Rodriguez >>> --- >>>  drivers/net/wireless/iwlwifi/iwl-3945-rs.c |    7 +++---- >>>  drivers/net/wireless/iwlwifi/iwl-sta.c     |    5 ++--- >>>  2 files changed, 5 insertions(+), 7 deletions(-) >>> >>> diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c >>> index 5eb538d..bd2f709 100644 >>> --- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c >>> +++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c >>> @@ -673,7 +673,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, >>>        s8 scale_action = 0; >>>        unsigned long flags; >>>        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; >>> -       u16 fc; >>> +       __le16 fc; >>>        u16 rate_mask = 0; >>>        s8 max_rate_idx = -1; >>>        struct iwl_priv *priv = (struct iwl_priv *)priv_r; >>> @@ -685,9 +685,8 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, >>>                rate_mask = sta->supp_rates[sband->band]; >>> >>>        /* Send management frames and NO_ACK data using lowest rate. */ >>> -       fc = le16_to_cpu(hdr->frame_control); >>> -       if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA || >>> -           info->flags & IEEE80211_TX_CTL_NO_ACK || >>> +       fc = hdr->frame_control; >>> +       if (!ieee80211_is_data(fc) || info->flags & IEEE80211_TX_CTL_NO_ACK || >> >> iwl-agn-rs.c also needs this change I think... > > You are right, but in my later patch "mac80211: add helper for > management / no-ack frame rate decision" we just nuke this in favor > for the helper. The goal of this intermediary patch was just to make > the changes for that other patch easier to read. > > Please let me know if such a change is required in this intermediary > patch. It gets nuked in the end. Oh I just checked and actually it was that iwl-agn-rs.c already used it. Luis