From c9be55c1c2d84cc62cb4352417aecd2a2d3392eb Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Wed, 14 Jun 2006 17:51:14 +0200 Subject: [PATCH] --- yaml --- r: 32081 b: refs/heads/master c: e8d596972221aea55ae7f5c2bb7d5895039f664d h: refs/heads/master i: 32079: a56cdb51af1b03fcd2aff78eb616f67f0fa94698 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 63dd7e1bdfc2..4fd4cca608c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3cef4ee2207033b9f231da308d966f357af34da +refs/heads/master: e8d596972221aea55ae7f5c2bb7d5895039f664d diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c index d8ece28c079f..6dbd855b3647 100644 --- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c +++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c @@ -296,11 +296,14 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm, u16 control = 0; u16 wsec_rate = 0; u16 encrypt_frame; + const u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(wireless_header->frame_ctl)); + const int is_mgt = (ftype == IEEE80211_FTYPE_MGMT); /* Now construct the TX header. */ memset(txhdr, 0, sizeof(*txhdr)); - bitrate = bcm->softmac->txrates.default_rate; + bitrate = ieee80211softmac_suggest_txrate(bcm->softmac, + is_multicast_ether_addr(wireless_header->addr1), is_mgt); ofdm_modulation = !(ieee80211_is_cck_rate(bitrate)); fallback_bitrate = bcm43xx_calc_fallback_rate(bitrate); fallback_ofdm_modulation = !(ieee80211_is_cck_rate(fallback_bitrate));