diff options
| author | Nishant Sarmukadam <nishants@marvell.com> | 2011-02-17 14:45:17 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-23 16:25:25 -0500 |
| commit | 0bf22c3751d19f9be20205c0e7112723618a4858 (patch) | |
| tree | 628fc4a0a4a1935da52a926d9c9fa2f867eaa051 /drivers/net | |
| parent | da62b761769f60e5d476ad882c5ba40fb5d61664 (diff) | |
| download | linux-3.10-0bf22c3751d19f9be20205c0e7112723618a4858.tar.gz linux-3.10-0bf22c3751d19f9be20205c0e7112723618a4858.tar.bz2 linux-3.10-0bf22c3751d19f9be20205c0e7112723618a4858.zip | |
mwl8k: Tell mac80211 we have rate adaptation in FW
All mwl8k parts perform rate control in firmware. Make this known to
mac80211 so that it does not launch minstrel. Also, because actual tx
rate information is not available from the firmware, invalidate the
rate status before returning the skb to mac80211.
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index f79da1b1487..44355f7dd61 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -1535,6 +1535,13 @@ mwl8k_txq_reclaim(struct ieee80211_hw *hw, int index, int limit, int force) info = IEEE80211_SKB_CB(skb); ieee80211_tx_info_clear_status(info); + + /* Rate control is happening in the firmware. + * Ensure no tx rate is being reported. + */ + info->status.rates[0].idx = -1; + info->status.rates[0].count = 1; + if (MWL8K_TXD_SUCCESS(status)) info->flags |= IEEE80211_TX_STAT_ACK; @@ -4764,7 +4771,7 @@ static int mwl8k_firmware_load_success(struct mwl8k_priv *priv) hw->queues = MWL8K_TX_QUEUES; /* Set rssi values to dBm */ - hw->flags |= IEEE80211_HW_SIGNAL_DBM; + hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL; hw->vif_data_size = sizeof(struct mwl8k_vif); hw->sta_data_size = sizeof(struct mwl8k_sta); |