2009/6/8 Gábor Stefanik <netrolller.3d@xxxxxxxxx>: > On Sat, Jun 6, 2009 at 2:03 AM, Luis R. Rodriguez<lrodriguez@xxxxxxxxxxx> wrote: >> Cc: Zhu Yi <yi.zhu@xxxxxxxxx> >> Cc: Reinette Chatre <reinette.chatre@xxxxxxxxx> >> Cc: ipw3945-devel@xxxxxxxxxxxxxxxxxxxxx >> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx> >> --- >> 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. Luis -- 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
